summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
Diffstat (limited to 'pym')
-rw-r--r--pym/_emerge/resolver/slot_collision.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/_emerge/resolver/slot_collision.py b/pym/_emerge/resolver/slot_collision.py
index 1bde0bea4..3305622ad 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)