diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2006-04-13 05:39:30 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-04-13 05:39:30 +0000 |
| commit | 14724ade6e80459cda3434f5f2e64fb22a9095fd (patch) | |
| tree | 839b784254e8479e0e776a2e97a018e51629fc69 | |
| parent | d3caafb7be8bf00185d13b55046f0362ccbfc62d (diff) | |
| download | portage-14724ade6e80459cda3434f5f2e64fb22a9095fd.tar.gz portage-14724ade6e80459cda3434f5f2e64fb22a9095fd.tar.bz2 portage-14724ade6e80459cda3434f5f2e64fb22a9095fd.zip | |
fixes by solar for ROOT output when unmerging #129649 and make --quiet output a bit more useful
svn path=/main/trunk/; revision=3137
| -rwxr-xr-x | bin/emerge | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bin/emerge b/bin/emerge index bdc604105..d549ad72e 100755 --- a/bin/emerge +++ b/bin/emerge @@ -2225,8 +2225,12 @@ def unmerge(unmerge_action, unmerge_files): print "="+string.join(sp_absx[sp_vdb_len:],"/") candidate_catpkgs.append("="+string.join(sp_absx[sp_vdb_len:],"/")) + if (not "--quiet" in myopts): + print + if portage.settings["ROOT"]: + print darkgreen(">>> Using system located in ROOT tree "+portage.settings["ROOT"]) if (("--pretend" in myopts) or ("--ask" in myopts)) and not ("--quiet" in myopts): - print darkgreen("\n>>> These are the packages that would be unmerged:") + print darkgreen(">>> These are the packages that would be unmerged:") pkgmap={} numselected=0 @@ -2324,12 +2328,10 @@ def unmerge(unmerge_action, unmerge_files): else: print "none", print - - if portage.settings["ROOT"]: - print string.rjust("ROOT:", 12) + " " + white(portage.settings["ROOT"]) - print "\n>>>",red("'Selected'"),"packages are slated for removal." - print ">>>",green("'Protected'"),"and",green("'omitted'"),"packages will not be removed.\n" + if (not "--quiet" in myopts): + print "\n>>>",red("'Selected'"),"packages are slated for removal." + print ">>>",green("'Protected'"),"and",green("'omitted'"),"packages will not be removed.\n" if "--pretend" in myopts: #we're done... return |