[patch] fix invalid highlight_violations() use argument

highlight_violations.patch (text/plain), 1.20 KB, created by Zac Medico on 2010-09-05 19:02:14 UTC

From d5a8a4443dcc22bf0755c031ced4cef66b2cf370 Mon Sep 17 00:00:00 2001
From: Zac Medico <[e-mail]>
Date: Sun, 5 Sep 2010 11:55:59 -0700
Subject: [PATCH] Bug #336085 - Fix logic error inside
 slot_conflict_handler._prepare_conflict_msg_and_check_for_specificity()
 which causes an irrelevant "use" collision reason to be passed to
 highlight_violations().

---
 pym/_emerge/resolver/slot_collision.py |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 1bde0be..3305622 100644
--- a/pym/_emerge/resolver/slot_collision.py
+++ b/pym/_emerge/resolver/slot_collision.py
@@ -327,7 +327,12 @@ class slot_conflict_handler(object):
 										if ppkg == x[0] and atom == x[1]:
 											version_violated = True
 								elif type == "use":
-									use.append(sub_type)
+									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]:
+											use.append(sub_type)
+											break
 
 							atom_str = highlight_violations(atom.unevaluated_atom, version_violated, use)
 
-- 
1.7.1.1