summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-03-28 01:39:49 +0000
committerZac Medico <zmedico@gentoo.org>2009-03-28 01:39:49 +0000
commit2578caeb09ab77359a768f1800b428e940da008a (patch)
tree2c327be030faefc71331015828f35d48d468b06c
parent18f3b6ca7a5faa6a1ffe90f3c6f58b0dc0a6595d (diff)
downloadportage-2578caeb09ab77359a768f1800b428e940da008a.tar.gz
portage-2578caeb09ab77359a768f1800b428e940da008a.tar.bz2
portage-2578caeb09ab77359a768f1800b428e940da008a.zip
Don't show the package counter for "Uninstalling" messages.
svn path=/main/trunk/; revision=13240
-rw-r--r--pym/_emerge/__init__.py9
1 files changed, 6 insertions, 3 deletions
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 != "/":