diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-09-06 16:44:34 +0200 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-06 09:46:42 -0700 |
| commit | 5a3222ee052dd924a275c4d1c8ae3c44dc684e57 (patch) | |
| tree | ef410bc67aff09ef095798046a70294fa54934bb | |
| parent | b412cd22d395db6b488fa97dcf2ccf9bc9359b58 (diff) | |
| download | portage-5a3222ee052dd924a275c4d1c8ae3c44dc684e57.tar.gz portage-5a3222ee052dd924a275c4d1c8ae3c44dc684e57.tar.bz2 portage-5a3222ee052dd924a275c4d1c8ae3c44dc684e57.zip | |
slot_collision_handler: Fix bug related to highlight_violations (bug 336085)
| -rw-r--r-- | pym/_emerge/resolver/slot_collision.py | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py index 3305622ad..e68543bf5 100644 --- a/pym/_emerge/resolver/slot_collision.py +++ b/pym/_emerge/resolver/slot_collision.py @@ -321,18 +321,14 @@ class slot_conflict_handler(object): # Package types. version_violated = False use = [] - for type, sub_type in collision_reasons: - if type == "version": - for x in collision_reasons[(type, sub_type)]: - if ppkg == x[0] and atom == x[1]: + for (type, sub_type), parents in collision_reasons.items(): + for x in parents: + if parent == x[0] and atom == x[1]: + if type == "version": version_violated = True - elif type == "use": - for x in collision_reasons[(type, sub_type)]: - # TODO: Review this conditional for - # validity (see bug #336085). - if ppkg == x[0] and atom == x[1]: + elif type == "use": use.append(sub_type) - break + break atom_str = highlight_violations(atom.unevaluated_atom, version_violated, use) |