depgraph: ignore fewer deps
authorZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 06:40:57 +0000 (22:40 -0800)
committerZac Medico <zmedico@gentoo.org>
Mon, 14 Feb 2011 07:48:24 +0000 (23:48 -0800)
This restores some desired logic that was left out of commit
5655b4dcfe5e9dae5e9d6352d791c3d04953baf7.

pym/_emerge/depgraph.py

index 23f45e2e6bc9c4e208ff004171b36bb5db2704f6..0bb9667f23cd0d04cc9f7b44548c6f24f3b4c685 100644 (file)
@@ -1299,7 +1299,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:
@@ -1384,7 +1386,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: