diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-09 07:54:45 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-12 01:17:24 -0700 |
| commit | c315aefb71c12c52960b582efd24290284372e95 (patch) | |
| tree | 5ee93dc7247dd9d454267d34ed1b4bece7352a99 /pym/_emerge | |
| parent | 6736994827eb295593842afe1a2b159ee84b4a4f (diff) | |
| download | portage-c315aefb71c12c52960b582efd24290284372e95.tar.gz portage-c315aefb71c12c52960b582efd24290284372e95.tar.bz2 portage-c315aefb71c12c52960b582efd24290284372e95.zip | |
Tests: resolver/test_slot_collisions: Check for slot_collision_solutions
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 7 |
1 files changed, 5 insertions, 2 deletions
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) |