aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-10 20:53:15 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-08-10 20:53:15 +0100
commit02e0aa3aec60d8c6c7a90b1ec19c21b6ee11ca7e (patch)
tree5f234a5c7990ad6c6d5bc618432c95ce712b09b8
parent3c74e4333f977e53939969c4c8720e2c5f824fdf (diff)
downloadpaludis-02e0aa3aec60d8c6c7a90b1ec19c21b6ee11ca7e.tar.gz
paludis-02e0aa3aec60d8c6c7a90b1ec19c21b6ee11ca7e.tar.xz
shouldn't be comparing to installable
-rw-r--r--paludis/resolver/resolver.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc
index 0d83fdf..6213cd0 100644
--- a/paludis/resolver/resolver.cc
+++ b/paludis/resolver/resolver.cc
@@ -857,13 +857,7 @@ Resolver::_decision_from_package_id(const QPN_S & qpn_s, const std::tr1::shared_
std::tr1::shared_ptr<const PackageIDSequence> comparison_ids;
- if (is_installed)
- comparison_ids = ((*_imp->env)[selection::BestVersionOnly(
- generator::Package(qpn_s.package()) |
- qpn_s.make_slot_filter() |
- filter::SupportsAction<InstallAction>() |
- filter::NotMasked())]);
- else if (! is_nothing)
+ if (! is_nothing)
comparison_ids = ((*_imp->env)[selection::BestVersionOnly(
generator::Package(qpn_s.package()) |
qpn_s.make_slot_filter() |