From 2578caeb09ab77359a768f1800b428e940da008a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 28 Mar 2009 01:39:49 +0000 Subject: Don't show the package counter for "Uninstalling" messages. svn path=/main/trunk/; revision=13240 --- pym/_emerge/__init__.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'pym/_emerge/__init__.py') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 42f608a41..8eb382917 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -4035,14 +4035,17 @@ class PackageMerge(AsynchronousTask): if pkg.installed: action_desc = "Uninstalling" preposition = "from" + counter_str = "" else: action_desc = "Installing" preposition = "to" + counter_str = "(%s of %s) " % \ + (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), + colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval))) - msg = "%s (%s of %s) %s" % \ + msg = "%s %s%s" % \ (action_desc, - colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), - colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), + counter_str, colorize("GOOD", pkg.cpv)) if pkg.root != "/": -- cgit v1.2.3-1-g7c22