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 06:40:57 +0000 (22:40 -0800)
This restores some desired logic that was left out of commit
5655b4dcfe5e9dae5e9d6352d791c3d04953baf7.

pym/_emerge/depgraph.py

index 8a616dc76068f1846af60181f3d4b447d6e0d80a..b85c1325e3c286036e94d01435c16e1ccc3293a2 100644 (file)
@@ -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: