diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-13 22:40:57 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 23:48:24 -0800 |
| commit | e2a03fa52fde97fa2c843982923dac205823ea06 (patch) | |
| tree | 850d4e6f08118d7cf0eb9f33a2f2f9247a0b28d6 /pym | |
| parent | 5c72bae0306384a0f4e6f3fb67b5d59dba0f6b46 (diff) | |
| download | portage-e2a03fa52fde97fa2c843982923dac205823ea06.tar.gz portage-e2a03fa52fde97fa2c843982923dac205823ea06.tar.bz2 portage-e2a03fa52fde97fa2c843982923dac205823ea06.zip | |
depgraph: ignore fewer deps
This restores some desired logic that was left out of commit
5655b4dcfe5e9dae5e9d6352d791c3d04953baf7.
Diffstat (limited to 'pym')
| -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 23f45e2e6..0bb9667f2 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -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: |