From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Feb 2007 22:22:15 +0000 (-0000)
Subject: For bug #166880, always display the merge list header. (trunk r5999:6000)
X-Git-Tag: v2.1.2.1~62
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aa21fb1d552a77baf3e85ec24463b3c497c2680f;p=portage.git

For bug #166880, always display the merge list header. (trunk r5999:6000)

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

diff --git a/bin/emerge b/bin/emerge
index 55a63aa36..cd19e2640 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4584,7 +4584,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"