diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-07-09 17:51:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-07-09 17:51:06 -0700 |
| commit | ecd5ec2c060f0cfeaf13965bba67aed31e2c9093 (patch) | |
| tree | 9928797dfbd13bc68c56280eafa1bb6c01f09415 /pym/_emerge/resolver | |
| parent | da3ad6bd4e0adc5ee928f1886c9c147c637706f2 (diff) | |
| download | portage-ecd5ec2c060f0cfeaf13965bba67aed31e2c9093.tar.gz portage-ecd5ec2c060f0cfeaf13965bba67aed31e2c9093.tar.bz2 portage-ecd5ec2c060f0cfeaf13965bba67aed31e2c9093.zip | |
slot_collision: be consistent with missing IUSE
Special handling for missing IUSE that was introduced in commit
9a193d42032005396800eb30e550691513529c79 is also useful in one
more spot.
Diffstat (limited to 'pym/_emerge/resolver')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index d43b8892d..00429976a 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -337,14 +337,21 @@ class slot_conflict_handler(object): #are fewer possible solutions. use = sub_type for ppkg, atom, other_pkg in parents: - parent_use = None - if isinstance(ppkg, Package): - parent_use = _pkg_use_enabled(ppkg) - violated_atom = atom.unevaluated_atom.violated_conditionals( \ - _pkg_use_enabled(other_pkg), other_pkg.iuse.is_valid_flag, - parent_use=parent_use) - if use in violated_atom.use.enabled.union(violated_atom.use.disabled): + missing_iuse = other_pkg.iuse.get_missing_iuse( + atom.unevaluated_atom.use.required) + if missing_iuse: unconditional_use_deps.add((ppkg, atom)) + else: + parent_use = None + if isinstance(ppkg, Package): + parent_use = _pkg_use_enabled(ppkg) + violated_atom = atom.unevaluated_atom.violated_conditionals( + _pkg_use_enabled(other_pkg), + other_pkg.iuse.is_valid_flag, + parent_use=parent_use) + if use in violated_atom.use.enabled or \ + use in violated_atom.use.disabled: + unconditional_use_deps.add((ppkg, atom)) # When USE flags are removed, it can be # essential to see all broken reverse # dependencies here, so don't omit any. |