diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-26 22:52:52 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-26 22:52:52 -0700 |
| commit | b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6 (patch) | |
| tree | 88f027881bf0b5a37eea157749c3e0d14c9642a2 | |
| parent | 4511c049634c26a3235f3c2d0e519ab01f950371 (diff) | |
| download | portage-b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6.tar.gz portage-b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6.tar.bz2 portage-b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6.zip | |
Revert one more change from bug #337178: parent_atoms is supposed
to refer to the new pkg, not the one to_be_masked.
| -rw-r--r-- | pym/_emerge/depgraph.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 54e412a50..50aefda28 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -899,7 +899,7 @@ class depgraph(object): to_be_masked = existing_node parent_atoms = \ - self._dynamic_config._parent_atoms.get(to_be_masked, set()) + self._dynamic_config._parent_atoms.get(pkg, set()) if parent_atoms: conflict_atoms = self._dynamic_config._slot_conflict_parent_atoms.intersection(parent_atoms) if conflict_atoms: |