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 c867f06b22852b26c5338d5a5ec7de1481ba574d..002e7f9dd3eaf41f0001825bcd69b48d548f0e81 100644 (file)
--- 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"