From b6c2a1e0a6657e36b1dd5a3c28461698d0e1a0d6 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 26 Sep 2010 22:52:52 -0700 Subject: Revert one more change from bug #337178: parent_atoms is supposed to refer to the new pkg, not the one to_be_masked. --- pym/_emerge/depgraph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pym/_emerge') 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: -- cgit v1.2.3-1-g7c22