From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 14 Feb 2011 06:40:57 +0000 (-0800)
Subject: depgraph: ignore fewer deps
X-Git-Tag: v2.2.0_alpha24~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fd45120a1ec8eb863a0890d947d2d428cfdad55;p=portage.git

depgraph: ignore fewer deps

This restores some desired logic that was left out of commit
5655b4dcfe5e9dae5e9d6352d791c3d04953baf7.
---

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 8a616dc76..b85c1325e 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1280,7 +1280,9 @@ class depgraph(object):
 				mypriority.satisfied and \
 				mypriority.satisfied.visible and \
 				dep.child is not None and \
-				not dep.child.installed:
+				not dep.child.installed and \
+				self._dynamic_config._slot_pkg_map[dep.child.root].get(
+				dep.child.slot_atom) is None:
 				myarg = None
 				if dep.root == self._frozen_config.target_root:
 					try:
@@ -1365,7 +1367,9 @@ class depgraph(object):
 					mypriority.satisfied and \
 					mypriority.satisfied.visible and \
 					dep.child is not None and \
-					not dep.child.installed:
+					not dep.child.installed and \
+					self._dynamic_config._slot_pkg_map[dep.child.root].get(
+					dep.child.slot_atom) is None:
 					myarg = None
 					if dep.root == self._frozen_config.target_root:
 						try: