From: Zac Medico Date: Mon, 27 Sep 2010 05:52:52 +0000 (-0700) Subject: Revert one more change from bug #337178: parent_atoms is supposed X-Git-Tag: v2.2_rc88~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6;p=portage.git Revert one more change from bug #337178: parent_atoms is supposed to refer to the new pkg, not the one to_be_masked. --- 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: