1 |
Author: zmedico |
2 |
Date: 2009-03-28 01:39:49 +0000 (Sat, 28 Mar 2009) |
3 |
New Revision: 13240 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
Don't show the package counter for "Uninstalling" messages. |
9 |
|
10 |
|
11 |
Modified: main/trunk/pym/_emerge/__init__.py |
12 |
=================================================================== |
13 |
--- main/trunk/pym/_emerge/__init__.py 2009-03-28 01:17:57 UTC (rev 13239) |
14 |
+++ main/trunk/pym/_emerge/__init__.py 2009-03-28 01:39:49 UTC (rev 13240) |
15 |
@@ -4035,14 +4035,17 @@ |
16 |
if pkg.installed: |
17 |
action_desc = "Uninstalling" |
18 |
preposition = "from" |
19 |
+ counter_str = "" |
20 |
else: |
21 |
action_desc = "Installing" |
22 |
preposition = "to" |
23 |
+ counter_str = "(%s of %s) " % \ |
24 |
+ (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), |
25 |
+ colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval))) |
26 |
|
27 |
- msg = "%s (%s of %s) %s" % \ |
28 |
+ msg = "%s %s%s" % \ |
29 |
(action_desc, |
30 |
- colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), |
31 |
- colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), |
32 |
+ counter_str, |
33 |
colorize("GOOD", pkg.cpv)) |
34 |
|
35 |
if pkg.root != "/": |