From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Feb 2007 22:21:42 +0000 (-0000)
Subject: For bug #166880, always display the merge list header.
X-Git-Tag: v2.2_pre1~1682
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=440bfc7b62d99c1b699370c842d82e86ebd46bfa;p=portage.git

For bug #166880, always display the merge list header.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index c867f06b2..002e7f9dd 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4645,7 +4645,7 @@ def action_build(settings, trees, mtimedb,
 	myopts, myaction, myfiles, spinner):
 	ldpath_mtimes = mtimedb["ldpath"]
 	favorites=[]
-	if ("--ask" in myopts or "--pretend" in myopts) and not "--quiet" in myopts:
+	if "--quiet" not in myopts:
 		action = ""
 		if "--fetchonly" in myopts or "--fetch-all-uri" in myopts:
 			action = "fetched"