From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 30 Mar 2008 23:51:26 +0000 (-0000)
Subject: Fix broken unsatisfied deps handling that triggers false positives in
X-Git-Tag: v2.1.5~275
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e5fb3a2637eb4821a85de661cf0e3ea4956ff9ca;p=portage.git

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
---

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: