summaryrefslogtreecommitdiffstats
path: root/pym/_emerge/depgraph.py
diff options
context:
space:
mode:
Diffstat (limited to 'pym/_emerge/depgraph.py')
-rw-r--r--pym/_emerge/depgraph.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 704686567..e151eaefe 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -470,9 +470,7 @@ class depgraph(object):
self._show_merge_list()
- self._dynamic_config._slot_conflict_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)
handler = self._dynamic_config._slot_conflict_handler
conflict = handler.get_conflict()