From: Alec Warner <antarus@gentoo.org>
Date: Fri, 3 Feb 2006 17:47:25 +0000 (-0000)
Subject: Shout out to RiverRat for reporting, fixup the output to use the correct verbs, disab... 
X-Git-Tag: v2.1_pre5_2760~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2899efe904e4394cd297de9bec98d04a3984890;p=portage.git

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
---

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"):