diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-02-13 22:40:57 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 22:40:57 -0800 |
| commit | 4fd45120a1ec8eb863a0890d947d2d428cfdad55 (patch) | |
| tree | d785cc6172a43f58e813b08d4c1cb7e3e85c2fd5 /pym/_emerge/depgraph.py | |
| parent | depgraph: remove redundant "empty" param checks (diff) | |
| download | portage-4fd45120a1ec8eb863a0890d947d2d428cfdad55.tar.gz portage-4fd45120a1ec8eb863a0890d947d2d428cfdad55.tar.bz2 portage-4fd45120a1ec8eb863a0890d947d2d428cfdad55.zip | |
depgraph: ignore fewer deps
This restores some desired logic that was left out of commit
5655b4dcfe5e9dae5e9d6352d791c3d04953baf7.
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 8 |
1 files changed, 6 insertions, 2 deletions
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: |