From 684fe497d9b2dd09ae3ec9290b5c503255838b41 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 20 Feb 2007 21:30:44 +0000 Subject: As requested by vapier, don't show the merge list in --quiet mode unless it's explicitly requested via --ask or --pretend. (trunk r6016:6017) svn path=/main/branches/2.1.2/; revision=6018 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index ae5bafb5e..dff6898a9 100755 --- 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"] -- cgit v1.2.3-1-g7c22