diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-11-15 08:19:21 +0100 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2012-11-15 08:19:21 +0100 |
| commit | 5c02700c9891922ba9af48165273b91bf52e314a (patch) | |
| tree | 49df7244417faf27368b60d707af6c1ec4310834 /pym/_emerge/resolver/slot_collision.py | |
| parent | bbbb9c8459dd51a564de16636d1246b585bf6733 (diff) | |
| download | portage-5c02700c9891922ba9af48165273b91bf52e314a.tar.gz portage-5c02700c9891922ba9af48165273b91bf52e314a.tar.bz2 portage-5c02700c9891922ba9af48165273b91bf52e314a.zip | |
EAPI="4-python" and EAPI="5-progress": Add support for use.aliases and package.use.aliases.
Diffstat (limited to 'pym/_emerge/resolver/slot_collision.py')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index bc95e916e..c2b04d58c 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -225,10 +225,11 @@ class slot_conflict_handler(object): new_change = {} for pkg in solution: for flag, state in solution[pkg].items(): + real_flag = pkg.iuse.get_real_flag(flag) if state == "enabled" and flag not in _pkg_use_enabled(pkg): - new_change.setdefault(pkg, {})[flag] = True + new_change.setdefault(pkg, {})[real_flag] = True elif state == "disabled" and flag in _pkg_use_enabled(pkg): - new_change.setdefault(pkg, {})[flag] = False + new_change.setdefault(pkg, {})[real_flag] = False return new_change def _prepare_conflict_msg_and_check_for_specificity(self): |