aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-28 20:43:47 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-10-28 20:43:47 +0000
commit5a9516d4634906b3c78c9a85debef9866f0f92c5 (patch)
tree9822d91bb47cf047585b21763bb061e11ab64ce3
parent932596077ee44f41f3c095509b56c6ea9860d7dc (diff)
downloadpaludis-5a9516d4634906b3c78c9a85debef9866f0f92c5.tar.gz
paludis-5a9516d4634906b3c78c9a85debef9866f0f92c5.tar.xz
Don't really need this
-rw-r--r--paludis/resolver/resolution.cc3
-rw-r--r--paludis/resolver/resolution.hh3
-rw-r--r--paludis/resolver/resolver.cc4
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc2
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.hh1
-rw-r--r--src/clients/cave/cmd_resolve_dump.cc7
6 files changed, 3 insertions, 17 deletions
diff --git a/paludis/resolver/resolution.cc b/paludis/resolver/resolution.cc
index c7a524c..0a160b4 100644
--- a/paludis/resolver/resolution.cc
+++ b/paludis/resolver/resolution.cc
@@ -60,8 +60,7 @@ Resolution::deserialise(Deserialisation & d)
value_for<n::arrows>(arrows),
value_for<n::constraints>(v.member<std::tr1::shared_ptr<Constraints> >("constraints")),
value_for<n::decision>(v.member<std::tr1::shared_ptr<Decision> >("decision")),
- value_for<n::resolvent>(v.member<Resolvent>("resolvent")),
- value_for<n::sanitised_dependencies>(make_null_shared_ptr())
+ value_for<n::resolvent>(v.member<Resolvent>("resolvent"))
)));
}
diff --git a/paludis/resolver/resolution.hh b/paludis/resolver/resolution.hh
index 757cd2b..defa8bb 100644
--- a/paludis/resolver/resolution.hh
+++ b/paludis/resolver/resolution.hh
@@ -24,7 +24,6 @@
#include <paludis/resolver/arrow-fwd.hh>
#include <paludis/resolver/constraint-fwd.hh>
#include <paludis/resolver/decision-fwd.hh>
-#include <paludis/resolver/sanitised_dependencies-fwd.hh>
#include <paludis/resolver/resolvent.hh>
#include <paludis/util/named_value.hh>
#include <tr1/memory>
@@ -38,7 +37,6 @@ namespace paludis
struct constraints;
struct decision;
struct resolvent;
- struct sanitised_dependencies;
}
namespace resolver
@@ -50,7 +48,6 @@ namespace paludis
NamedValue<n::constraints, std::tr1::shared_ptr<Constraints> > constraints;
NamedValue<n::decision, std::tr1::shared_ptr<Decision> > decision;
NamedValue<n::resolvent, Resolvent> resolvent;
- NamedValue<n::sanitised_dependencies, std::tr1::shared_ptr<SanitisedDependencies> > sanitised_dependencies;
void serialise(Serialiser &) const;
diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc
index 7783a65..0bdd8e4 100644
--- a/paludis/resolver/resolver.cc
+++ b/paludis/resolver/resolver.cc
@@ -365,8 +365,7 @@ Resolver::_create_resolution_for_resolvent(const Resolvent & r) const
value_for<n::arrows>(make_shared_ptr(new ArrowSequence)),
value_for<n::constraints>(_initial_constraints_for(r)),
value_for<n::decision>(make_null_shared_ptr()),
- value_for<n::resolvent>(r),
- value_for<n::sanitised_dependencies>(make_null_shared_ptr())
+ value_for<n::resolvent>(r)
)));
}
@@ -767,7 +766,6 @@ Resolver::_add_dependencies_if_necessary(
const std::tr1::shared_ptr<SanitisedDependencies> deps(new SanitisedDependencies);
deps->populate(*this, our_resolvent, package_id);
- our_resolution->sanitised_dependencies() = deps;
for (SanitisedDependencies::ConstIterator s(deps->begin()), s_end(deps->end()) ;
s != s_end ; ++s)
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index 6cf0c5d..2aa1d09 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -176,8 +176,6 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
g_dump_options(this, "Dump Options", "Dump the resolver's state to stdout after completion, or when an "
"error occurs. For debugging purposes; produces rather a lot of noise."),
a_dump(&g_dump_options, "dump", '\0', "Dump debug output", true),
- a_dump_dependencies(&g_dump_options, "dump-dependencies", '\0', "If dumping, also dump the "
- "sanitised dependencies selected for every package", true),
a_dump_restarts(&g_dump_options, "dump-restarts", '\0', "Dump restarts", true)
{
}
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
index 66c7a09..a01b7db 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/cmd_resolve_cmdline.hh
@@ -98,7 +98,6 @@ namespace paludis
args::ArgsGroup g_dump_options;
args::SwitchArg a_dump;
- args::SwitchArg a_dump_dependencies;
args::SwitchArg a_dump_restarts;
};
diff --git a/src/clients/cave/cmd_resolve_dump.cc b/src/clients/cave/cmd_resolve_dump.cc
index c0cdd08..fcb8ed6 100644
--- a/src/clients/cave/cmd_resolve_dump.cc
+++ b/src/clients/cave/cmd_resolve_dump.cc
@@ -225,7 +225,7 @@ namespace
void dump(
const std::tr1::shared_ptr<Environment> &,
const std::tr1::shared_ptr<Resolver> & resolver,
- const ResolveCommandLine & cmdline)
+ const ResolveCommandLine &)
{
std::cout << "Dumping resolutions by QPN:S:" << std::endl << std::endl;
@@ -235,11 +235,6 @@ namespace
{
std::cout << c->first << std::endl;
std::cout << " = " << *c->second << std::endl;
- if (cmdline.resolution_options.a_dump_dependencies.specified() && c->second->sanitised_dependencies())
- for (SanitisedDependencies::ConstIterator d(c->second->sanitised_dependencies()->begin()),
- d_end(c->second->sanitised_dependencies()->end()) ;
- d != d_end ; ++d)
- std::cout << " -> " << *d << std::endl;
}
std::cout << std::endl;