From c315aefb71c12c52960b582efd24290284372e95 Mon Sep 17 00:00:00 2001 From: Sebastian Luther Date: Mon, 9 Aug 2010 07:54:45 +0200 Subject: Tests: resolver/test_slot_collisions: Check for slot_collision_solutions --- pym/_emerge/depgraph.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pym/_emerge/depgraph.py') diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index effa6d382..a912385ca 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -169,6 +169,7 @@ class _dynamic_depgraph_config(object): self._slot_collision_nodes = set() self._parent_atoms = {} self._slot_conflict_parent_atoms = set() + self._slot_conflict_handler = None self._serialized_tasks_cache = None self._scheduler_graph = None self._displayed_list = None @@ -470,8 +471,10 @@ class depgraph(object): self._show_merge_list() - handler = slot_conflict_handler(self._dynamic_config._slot_collision_info, \ - self._dynamic_config._parent_atoms, self._frozen_config.myopts) + self._dynamic_config._slot_conflict_handler = \ + slot_conflict_handler(self._dynamic_config._slot_collision_info, \ + self._dynamic_config._parent_atoms, self._frozen_config.myopts) + handler = self._dynamic_config._slot_conflict_handler conflict = handler.get_conflict() writemsg(conflict, noiselevel=-1) -- cgit v1.2.3-1-g7c22