diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-12-09 16:26:14 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-12-09 16:26:14 -0800 |
| commit | ecae0c4fc46d6bc8054104a99af90bc45d4e7429 (patch) | |
| tree | 5dd4700d67d0d1ef32f42d5d1df6b7c8ba80495b /pym/_emerge/resolver/slot_collision.py | |
| parent | 184b2ed92e83491b81b5894814e6935e870133df (diff) | |
| download | portage-ecae0c4fc46d6bc8054104a99af90bc45d4e7429.tar.gz portage-ecae0c4fc46d6bc8054104a99af90bc45d4e7429.tar.bz2 portage-ecae0c4fc46d6bc8054104a99af90bc45d4e7429.zip | |
get_real_flag: handls use-dep default bug #446666
Diffstat (limited to 'pym/_emerge/resolver/slot_collision.py')
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index e04166b81..8b2f4b888 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -226,6 +226,9 @@ class slot_conflict_handler(object): for pkg in solution: for flag, state in solution[pkg].items(): real_flag = pkg.iuse.get_real_flag(flag) + if real_flag is None: + # Triggered by use-dep defaults. + continue if state == "enabled" and flag not in _pkg_use_enabled(pkg): new_change.setdefault(pkg, {})[real_flag] = True elif state == "disabled" and flag in _pkg_use_enabled(pkg): |