From: Sebastian Luther <SebastianLuther@gmx.de>
Date: Mon, 6 Sep 2010 14:44:34 +0000 (+0200)
Subject: slot_collision_handler: Fix bug related to highlight_violations (bug 336085)
X-Git-Tag: v2.2_rc76~14
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a3222ee052dd924a275c4d1c8ae3c44dc684e57;p=portage.git

slot_collision_handler: Fix bug related to highlight_violations (bug 336085)
---

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)