diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-07-03 17:35:45 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-07-03 17:35:45 +0000 |
| commit | 6b141902dca0a989c8573b87b4d960de4f8db577 (patch) | |
| tree | 8a451b20167cc1d258cd170583bfcdeeb55e8f20 | |
| parent | 51def2af1f6cedad336f4b613e605eddce83065d (diff) | |
| download | portage-6b141902dca0a989c8573b87b4d960de4f8db577.tar.gz portage-6b141902dca0a989c8573b87b4d960de4f8db577.tar.bz2 portage-6b141902dca0a989c8573b87b4d960de4f8db577.zip | |
When displaying the resume merge list, don't show the skipped package when --skipfirst is enabled. See bug #121106.
svn path=/main/trunk/; revision=3778
| -rwxr-xr-x | bin/emerge | 16 | ||||
| -rw-r--r-- | pym/output.py | 1 |
2 files changed, 15 insertions, 2 deletions
diff --git a/bin/emerge b/bin/emerge index ff9c8391e..64a40c7fc 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3328,7 +3328,13 @@ def action_build(settings, trees, mtimedb, if "--ask" in myopts: if "--resume" in myopts: validate_merge_list(trees, mtimedb["resume"]["mergelist"]) - mydepgraph.display(mtimedb["resume"]["mergelist"]) + mymergelist = mtimedb["resume"]["mergelist"] + if "--skipfirst" in myopts: + mymergelist = mymergelist[1:] + if len(mymergelist) == 0: + print colorize("INFORM", "emerge: It seems we have nothing to resume...") + sys.exit(0) + mydepgraph.display(mymergelist) prompt="Would you like to resume merging these packages?" else: mydepgraph.display(mydepgraph.altlist()) @@ -3366,7 +3372,13 @@ def action_build(settings, trees, mtimedb, if ("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts): if ("--resume" in myopts): validate_merge_list(trees, mtimedb["resume"]["mergelist"]) - mydepgraph.display(mtimedb["resume"]["mergelist"]) + mymergelist = mtimedb["resume"]["mergelist"] + if "--skipfirst" in myopts: + mymergelist = mymergelist[1:] + if len(mymergelist) == 0: + print colorize("INFORM", "emerge: It seems we have nothing to resume...") + sys.exit(0) + mydepgraph.display(mymergelist) else: mydepgraph.display(mydepgraph.altlist()) else: diff --git a/pym/output.py b/pym/output.py index d41f7f20e..458cafa81 100644 --- a/pym/output.py +++ b/pym/output.py @@ -124,6 +124,7 @@ codes["HILITE"] = codes["teal"] codes["BRACKET"] = codes["blue"] # Portage functions +codes["INFORM"] = codes["darkgreen"] codes["UNMERGE_WARN"] = codes["red"] codes["MERGE_LIST_PROGRESS"] = codes["yellow"] |