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().

diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 1bde0bea46b8144a50ea81c7170ca14bcfe698b0..3305622ad7482eba009335bb7ae7ff22ed3a207c 100644 (file)
--- 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)