As requested by solar, never show a merge list unless it's explicitly requested by...

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 8c418447d36b4d02e797d7eb24e60ff6fcad7951..dc63b6b101791de427f1ddd2af7e5f63740989a9 100644 (file)
--- 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"