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

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

diff --git a/bin/emerge b/bin/emerge
index ae5bafb5e9b5e91c79f032782479957013a7c196..dff6898a941f5d4e6ba2f0b3efddb14af0adcc8b 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -4704,7 +4704,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"]