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

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 03b3031de1a0339c99555b1324906c489c4aa5a1..8c418447d36b4d02e797d7eb24e60ff6fcad7951 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4769,6 +4769,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"])