Shout out to RiverRat for reporting, fixup the output to use the correct verbs, disab...

svn path=/main/trunk/; revision=2644

diff --git a/bin/emerge b/bin/emerge
index f1a2438677727632b122fc00709081a07a0d4f6f..1317b25a59cefdc2fa190b5a79afaa3f6fef9440 100755 (executable)
--- 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"):