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

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

diff --git a/bin/emerge b/bin/emerge
index 1fa1a2dc6a30999b1e31fbfd4a615ba11ccd126e..fdd9c504b55ff5fb010f60c75e1e00f4a8290e0f 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4709,6 +4709,7 @@ def action_build(settings, trees, mtimedb,
                        sys.exit(1)
 
        if "--pretend" not in myopts and \
+               ("--ask" in myopts or "--tree" in myopts) and \
                not ("--quiet" in myopts and "--ask" not in myopts):
                if "--resume" in myopts:
                        validate_merge_list(trees, mtimedb["resume"]["mergelist"])