| 1 |
commit: 784c94ac3520a1fe0659be53fab07becaad6274b |
| 2 |
Author: Boris Minev <borisminev <AT> abv <DOT> bg> |
| 3 |
AuthorDate: Tue Apr 3 17:56:48 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 3 17:56:48 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=784c94ac |
| 7 |
|
| 8 |
unmerge: display progress counter, bug #386901 |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/unmerge.py | 15 ++++++++++++++- |
| 12 |
1 files changed, 14 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py |
| 15 |
index 0acdf99..89eae08 100644 |
| 16 |
--- a/pym/_emerge/unmerge.py |
| 17 |
+++ b/pym/_emerge/unmerge.py |
| 18 |
@@ -542,10 +542,23 @@ def unmerge(root_config, myopts, unmerge_action, |
| 19 |
if clean_delay and not autoclean: |
| 20 |
countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging") |
| 21 |
|
| 22 |
+ all_selected = set() |
| 23 |
+ all_selected.update(*[x["selected"] for x in pkgmap]) |
| 24 |
+ |
| 25 |
+ # Set counter variables |
| 26 |
+ curval = 1 |
| 27 |
+ maxval = len(all_selected) |
| 28 |
+ |
| 29 |
for x in range(len(pkgmap)): |
| 30 |
for y in pkgmap[x]["selected"]: |
| 31 |
- writemsg_level(">>> Unmerging "+y+"...\n", noiselevel=-1) |
| 32 |
emergelog(xterm_titles, "=== Unmerging... ("+y+")") |
| 33 |
+ message = ">>> Unmerging ({0} of {1}) {2}...\n".format( |
| 34 |
+ colorize("MERGE_LIST_PROGRESS", str(curval)), |
| 35 |
+ colorize("MERGE_LIST_PROGRESS", str(maxval)), |
| 36 |
+ y) |
| 37 |
+ writemsg_level(message, noiselevel=-1) |
| 38 |
+ curval += 1 |
| 39 |
+ |
| 40 |
mysplit = y.split("/") |
| 41 |
#unmerge... |
| 42 |
retval = portage.unmerge(mysplit[0], mysplit[1], |
Archives