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

svn path=/main/branches/2.1.2/; revision=6065

diff --git a/bin/emerge b/bin/emerge
index fdd9c504b55ff5fb010f60c75e1e00f4a8290e0f..4193a9bff961e0459623bfa3edb08612e6363ebf 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4619,7 +4619,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"