| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 06:45:05 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13421 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Don't show the package counter for "Uninstalling" messages. (trunk r13240) |
| 9 |
|
| 10 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 11 |
=================================================================== |
| 12 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:44:06 UTC (rev 13420) |
| 13 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-04-30 06:45:05 UTC (rev 13421) |
| 14 |
@@ -4016,14 +4016,17 @@ |
| 15 |
if pkg.installed: |
| 16 |
action_desc = "Uninstalling" |
| 17 |
preposition = "from" |
| 18 |
+ counter_str = "" |
| 19 |
else: |
| 20 |
action_desc = "Installing" |
| 21 |
preposition = "to" |
| 22 |
+ counter_str = "(%s of %s) " % \ |
| 23 |
+ (colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), |
| 24 |
+ colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval))) |
| 25 |
|
| 26 |
- msg = "%s (%s of %s) %s" % \ |
| 27 |
+ msg = "%s %s%s" % \ |
| 28 |
(action_desc, |
| 29 |
- colorize("MERGE_LIST_PROGRESS", str(pkg_count.curval)), |
| 30 |
- colorize("MERGE_LIST_PROGRESS", str(pkg_count.maxval)), |
| 31 |
+ counter_str, |
| 32 |
colorize("GOOD", pkg.cpv)) |
| 33 |
|
| 34 |
if pkg.root != "/": |
Archives