aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-26 14:09:28 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-26 14:28:25 +0000
commitf87d8444fe0862c1e575d2732ea42bb1c9318e5a (patch)
tree5ab7ad5f3472da8af7135586452bf1c913642e70
parent90fd50c8a0633a6a439e3cbd4ee19bbdbfd4d640 (diff)
downloadpaludis-f87d8444fe0862c1e575d2732ea42bb1c9318e5a.tar.gz
paludis-f87d8444fe0862c1e575d2732ea42bb1c9318e5a.tar.xz
Check for installed, not uninstallable.
Fixes: ticket:721
-rw-r--r--paludis/install_task.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 975717c..bce25ce 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -1393,8 +1393,7 @@ namespace
{
if (! failure)
if ((*env)[selection::SomeArbitraryVersion(generator::Matches(*node.spec(), MatchPackageOptions())
- | filter::SupportsAction<InstalledAction>()
- | filter::SupportsAction<UninstallAction>())]->empty())
+ | filter::SupportsAction<InstalledAction>())]->empty())
failure = node.spec();
}
@@ -1590,8 +1589,7 @@ namespace
* there are no matches here it's not a problem because of or-deps. */
std::tr1::shared_ptr<const PackageIDSequence> installed((*env)[selection::AllVersionsUnsorted(
generator::Matches(*node.spec(), MatchPackageOptions()) |
- filter::SupportsAction<InstalledAction>() |
- filter::SupportsAction<UninstallAction>())]);
+ filter::SupportsAction<InstalledAction>())]);
for (PackageIDSequence::ConstIterator i(installed->begin()), i_end(installed->end()) ;
i != i_end ; ++i)