summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/resolver/backtracking.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/_emerge/resolver/backtracking.py')
-rw-r--r--pym/_emerge/resolver/backtracking.py7
1 files changed, 2 insertions, 5 deletions
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)