As requested by vapier, don't show the merge list in --quiet mode unless it's explici...

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 50e91d64c5ab0e3be9f773c761e77fe95c4ba7a0..c0072d2f8d15ea5606aa0d77d3feedd38a2b9366 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4764,7 +4764,8 @@ def action_build(settings, trees, mtimedb,
                        sys.stderr.write("\nThese are required by '--usepkgonly' -- Terminating.\n\n")
                        sys.exit(1)
 
-       if "--pretend" not in myopts:
+       if "--pretend" not in myopts and \
+               not ("--quiet" in myopts and "--ask" not in myopts):
                if "--resume" in myopts:
                        validate_merge_list(trees, mtimedb["resume"]["mergelist"])
                        mymergelist = mtimedb["resume"]["mergelist"]