From f3324a8779f331a6ac663244221c760f991aca07 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 13 Oct 2012 19:53:09 -0700 Subject: simplify Display.convert_myoldbest(). --- pym/_emerge/resolver/output.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 8a1e63ae5..275a0539a 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -22,7 +22,7 @@ from portage.output import ( blue, colorize, create_color_func, darkblue, darkgreen, green, nc_len, teal) bad = create_color_func("BAD") from portage.util import writemsg_stdout -from portage.versions import best, catpkgsplit +from portage.versions import best from _emerge.Blocker import Blocker from _emerge.create_world_atom import create_world_atom @@ -379,7 +379,7 @@ class Display(object): if myoldbest: versions = [] for pos, old_pkg in enumerate(myoldbest): - key = catpkgsplit(old_pkg.cpv)[2] + "-" + catpkgsplit(old_pkg.cpv)[3] + key = old_pkg.version if key[-3:] == "-r0": key = key[:-3] if self.conf.verbosity == 3 and not self.quiet_repo_display and (self.verbose_main_repo_display or -- cgit v1.2.3-1-g7c22