From: Zac Medico Date: Tue, 20 Feb 2007 21:25:03 +0000 (-0000) Subject: As requested by vapier, don't show the merge list in --quiet mode unless it's explici... X-Git-Tag: v2.2_pre1~1674 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ac38cf72540a1766c5f2eb372cbf21e0c33a424;p=portage.git As requested by vapier, don't show the merge list in --quiet mode unless it's explicitly requested via --ask or --pretend. svn path=/main/trunk/; revision=6017 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 50e91d64c..c0072d2f8 100644 --- 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"]