summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-03-30 23:51:26 +0000
committerZac Medico <zmedico@gentoo.org>2008-03-30 23:51:26 +0000
commite5fb3a2637eb4821a85de661cf0e3ea4956ff9ca (patch)
treeab0369e39ca82c3102cc5f35f780c0fab42d08cb /bin
parentdac0b9f823387d7aaea211ae360e2ca2d4be7bda (diff)
downloadportage-e5fb3a2637eb4821a85de661cf0e3ea4956ff9ca.tar.gz
portage-e5fb3a2637eb4821a85de661cf0e3ea4956ff9ca.tar.bz2
portage-e5fb3a2637eb4821a85de661cf0e3ea4956ff9ca.zip
Fix broken unsatisfied deps handling that triggers false positives in
a case like virtual/pager which is both a new-style and old-style virtual. svn path=/main/branches/2.1.2/; revision=9642
Diffstat (limited to 'bin')
-rwxr-xr-xbin/emerge11
1 files changed, 6 insertions, 5 deletions
diff --git a/bin/emerge b/bin/emerge
index 73d5f3830..0550fa585 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1768,11 +1768,6 @@ class depgraph:
# - multi-slot atoms listed in the world file
# to prevent depclean from removing them
- if arg and "selective" not in self.myparams:
- self._unsatisfied_deps_for_display.append(
- ((pkg.root, arg), {"myparent":myparent}))
- return 0
-
if not visible(pkgsettings, pkg.cpv, pkg.metadata,
built=pkg.built, installed=pkg.installed):
self._masked_installed.append((pkg, pkgsettings))
@@ -2084,6 +2079,12 @@ class depgraph:
self._unsatisfied_deps_for_display.append(
((myroot, myatom), {"myparent":None}))
return False, myfavorites
+
+ if pkg.installed and "selective" not in self.myparams:
+ self._unsatisfied_deps_for_display.append(
+ ((myroot, myatom), {"myparent":None}))
+ return 0, myfavorites
+
try:
self.mysd = self.create(pkg, None)
except portage_exception.MissingSignature, e: