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

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

svn path=/main/trunk/; revision=6064
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 8c418447d..dc63b6b10 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4679,7 +4679,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"