diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-10 05:05:58 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-10 05:05:58 -0700 |
| commit | 0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86 (patch) | |
| tree | bd53456447588707b3463916efa8adbf33c475ca /pym/_emerge/resolver | |
| parent | f085533e820e7dac48c5192aa0ae3b7fb887059d (diff) | |
| download | portage-0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86.tar.gz portage-0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86.tar.bz2 portage-0dfe36c463f2aeca4bbdb15f8aa3bdb2fd60ef86.zip | |
slot_collision: fix more for bug 374423
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index 0069d179d..0df8f20a2 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -588,6 +588,15 @@ class slot_conflict_handler(object): else: violated_atom = atom.unevaluated_atom.violated_conditionals(_pkg_use_enabled(pkg), \ pkg.iuse.is_valid_flag, parent_use=_pkg_use_enabled(ppkg)) + if violated_atom.use is None: + # It's possible for autounmask to change + # parent_use such that the unevaluated form + # of the atom now matches, even though the + # earlier evaluated form (from before + # autounmask changed parent_use) does not. + # In this case (see bug #374423), it's + # expected that violated_atom.use is None. + continue if pkg.installed and (violated_atom.use.enabled or violated_atom.use.disabled): #We can't change USE of an installed package (only of an ebuild, but that is already |