From 1072d0ec293c282f74d283ed8fe1c994d1d7875e Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Wed, 9 May 2012 11:18:58 +0100 Subject: [PATCH] Include ID in explanation if versions are identical --- zeroinstall/injector/solver.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/zeroinstall/injector/solver.py b/zeroinstall/injector/solver.py index f23f420..787bbf0 100644 --- a/zeroinstall/injector/solver.py +++ b/zeroinstall/injector/solver.py @@ -774,11 +774,23 @@ class SATSolver(Solver): _("is locally available"), _("better ID (tie-breaker)"), ] + + actual = actual_selection.get_version() + if impl.get_version() == actual: + def detail(i): + if len(i.id) < 18: + return " (" + i.id + ")" + else: + return " (" + i.id[:16] + "...)" + + wanted += detail(impl) + actual += detail(actual_selection) + for i in range(len(wanted_rating)): if wanted_rating[i] < selected_rating[i]: return _("{wanted} is ranked lower than {actual}: {why}").format( wanted = wanted, - actual = actual_selection.get_version(), + actual = actual, why = _ranking_component_reason[i]) used_impl = iface.uri in s.selections.selections -- 2.11.4.GIT