diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-09-05 11:55:59 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-09-05 11:55:59 -0700 |
| commit | d5a8a4443dcc22bf0755c031ced4cef66b2cf370 (patch) | |
| tree | 864baf7162c1d72bd9fda646fe15c16feb3133b5 | |
| parent | af6f7419e31d0338bfb230d91566d7d0a487036d (diff) | |
| download | portage-d5a8a4443dcc22bf0755c031ced4cef66b2cf370.tar.gz portage-d5a8a4443dcc22bf0755c031ced4cef66b2cf370.tar.bz2 portage-d5a8a4443dcc22bf0755c031ced4cef66b2cf370.zip | |
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().
| -rw-r--r-- | 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 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) |