diff options
| author | Alec Warner <antarus@gentoo.org> | 2006-02-03 17:47:25 +0000 |
|---|---|---|
| committer | Alec Warner <antarus@gentoo.org> | 2006-02-03 17:47:25 +0000 |
| commit | a2899efe904e4394cd297de9bec98d04a3984890 (patch) | |
| tree | bc6c218d914d473e44f4b1ab8a89ac778f046b8b | |
| parent | 20f5051fd35d64a1fa66daa2b0895677f7ca8f31 (diff) | |
| download | portage-a2899efe904e4394cd297de9bec98d04a3984890.tar.gz portage-a2899efe904e4394cd297de9bec98d04a3984890.tar.bz2 portage-a2899efe904e4394cd297de9bec98d04a3984890.zip | |
Shout out to RiverRat for reporting, fixup the output to use the correct verbs, disable tree output for fetching since it does not work.
svn path=/main/trunk/; revision=2644
| -rwxr-xr-x | bin/emerge | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/bin/emerge b/bin/emerge index f1a243867..1317b25a5 100755 --- a/bin/emerge +++ b/bin/emerge @@ -3216,14 +3216,19 @@ elif "depclean"==myaction: else: favorites=[] syslist=getlist("system") - if ((("--pretend" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts)) or ("--ask" in myopts)) and not ("--quiet" in myopts): - if "--tree" in myopts: + if "--ask" in myopts or "--pretend" in myopts: + action = "" + if "--fetchonly" in myopts or "--fetch-all-uri" in myopts: + action = "fetched" + else: + action = "merged" + if "--tree" in myopts and action != "fetched": # Tree doesn't work with fetching print - print darkgreen("These are the packages that would be merged, in reverse order:") + print darkgreen("These are the packages that would be %s, in reverse order:") % action print else: print - print darkgreen("These are the packages that would be merged, in order:") + print darkgreen("These are the packages that would be %s, in order:") % action print if ("--resume" in myopts) and portage.mtimedb.has_key("resume"): |