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 55a63aa367e6a2f0564cc1047d3bfe1681124607..cd19e2640e82c300375df82df28622097574f30a 100755 (executable)
--- 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"