From 9ff5e9731142d389373ea6ebc949919c3b637110 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Tue, 5 Oct 2010 20:05:32 +0200 Subject: Mask packages that don't satisfy all atoms. This also fixes a logic error in resolver/backtracking/Backtracker._feedback_slot_conflict() --- pym/_emerge/resolver/backtracking.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'pym/_emerge/resolver') diff --git a/pym/_emerge/resolver/backtracking.py b/pym/_emerge/resolver/backtracking.py index 9a018cc71..1ffada96f 100644 --- a/pym/_emerge/resolver/backtracking.py +++ b/pym/_emerge/resolver/backtracking.py @@ -102,11 +102,8 @@ class Backtracker(object): new_node.depth += 1 new_node.mask_steps += 1 new_node.terminal = False - for other_pkg, other_parent_atoms in conflict_data: - if other_pkg is pkg: - continue - new_node.parameter.runtime_pkg_mask.setdefault( - other_pkg, {})["slot conflict"] = other_parent_atoms + new_node.parameter.runtime_pkg_mask.setdefault( + pkg, {})["slot conflict"] = parent_atoms self._add(new_node) -- cgit v1.2.3-1-g7c22