From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 23 Feb 2007 23:52:43 +0000 (-0000)
Subject: As requested by solar, never show a merge list unless it's explicitly requested by... 
X-Git-Tag: v2.1.2.1~32
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2d4240c952e9518701887ff4747ad290ae8ec738;p=portage.git

As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree. (trunk r6064)

svn path=/main/branches/2.1.2/; revision=6065
---

diff --git a/bin/emerge b/bin/emerge
index fdd9c504b..4193a9bff 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4619,7 +4619,8 @@ def action_build(settings, trees, mtimedb,
 	myopts, myaction, myfiles, spinner):
 	ldpath_mtimes = mtimedb["ldpath"]
 	favorites=[]
-	if "--quiet" not in myopts:
+	if "--quiet" not in myopts and \
+		("--pretend" in myopts or "--ask" in myopts or "--tree" in myopts):
 		action = ""
 		if "--fetchonly" in myopts or "--fetch-all-uri" in myopts:
 			action = "fetched"