From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 06:45:05 +0000 (-0000)
Subject: Don't show the package counter for "Uninstalling" messages. (trunk r13240)
X-Git-Tag: v2.1.6.12~152
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9d2cee9d6afd7a8d645686602c5755cff44349af;p=portage.git

Don't show the package counter for "Uninstalling" messages. (trunk r13240)

svn path=/main/branches/2.1.6/; revision=13421
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index ebd64f105..3b04c3dcf 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -4016,14 +4016,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 != "/":