aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/sanitised_dependencies.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:27:07 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 23:27:07 +0100
commit42a477cd7c5525607ad093a227f96e42149131c5 (patch)
tree1724c3bc8da2a9d50353467c18fc83d20092fd22 /paludis/resolver/sanitised_dependencies.cc
parentee28577088fc168cdf81e1b79ecdc7d7c7f4adc6 (diff)
downloadpaludis-42a477cd7c5525607ad093a227f96e42149131c5.tar.gz
paludis-42a477cd7c5525607ad093a227f96e42149131c5.tar.xz
No need to rewrite specs any more
Diffstat (limited to 'paludis/resolver/sanitised_dependencies.cc')
-rw-r--r--paludis/resolver/sanitised_dependencies.cc25
1 files changed, 6 insertions, 19 deletions
diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc
index 395c675..ac6f50b 100644
--- a/paludis/resolver/sanitised_dependencies.cc
+++ b/paludis/resolver/sanitised_dependencies.cc
@@ -20,7 +20,6 @@
#include <paludis/resolver/sanitised_dependencies.hh>
#include <paludis/resolver/resolver.hh>
#include <paludis/resolver/resolution.hh>
-#include <paludis/resolver/spec_rewriter.hh>
#include <paludis/resolver/decider.hh>
#include <paludis/util/make_named_values.hh>
#include <paludis/util/save.hh>
@@ -150,20 +149,13 @@ namespace
{
seen_any = true;
- const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(spec,
- make_shared_copy(our_resolution->resolvent())));
- if (if_rewritten)
- if_rewritten->as_spec_tree()->top()->accept(*this);
+ if (active_sublist)
+ active_sublist->push_back(spec);
else
{
- if (active_sublist)
- active_sublist->push_back(spec);
- else
- {
- std::list<PackageOrBlockDepSpec> l;
- l.push_back(spec);
- child_groups.push_back(l);
- }
+ std::list<PackageOrBlockDepSpec> l;
+ l.push_back(spec);
+ child_groups.push_back(l);
}
}
@@ -351,12 +343,7 @@ namespace
void add(const SanitisedDependency & dep)
{
- const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(dep.spec(),
- make_shared_copy(our_resolution->resolvent())));
- if (if_rewritten)
- if_rewritten->as_spec_tree()->top()->accept(*this);
- else
- sanitised_dependencies.add(dep);
+ sanitised_dependencies.add(dep);
}
SanitisedDependency make_sanitised(const PackageOrBlockDepSpec & spec)