diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-20 09:54:19 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-20 05:15:54 -0700 |
| commit | 57cec9204a387ce27ce4703175b16189b3fdc45f (patch) | |
| tree | 24754654282d4748e35d34b862aba29cd44afcbf /pym/_emerge/depgraph.py | |
| parent | c37423eca2a1284d66737baf83155130e6bf994d (diff) | |
| download | portage-57cec9204a387ce27ce4703175b16189b3fdc45f.tar.gz portage-57cec9204a387ce27ce4703175b16189b3fdc45f.tar.bz2 portage-57cec9204a387ce27ce4703175b16189b3fdc45f.zip | |
slot collision handler: Work correctly with --autounmask
Diffstat (limited to 'pym/_emerge/depgraph.py')
| -rw-r--r-- | pym/_emerge/depgraph.py | 4 |
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() |