From: Zac Medico Date: Fri, 23 Feb 2007 23:39:28 +0000 (-0000) Subject: As requested by solar, never show a merge list unless it's explicitly requested by... X-Git-Tag: v2.2_pre1~1649 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=544273b5584d139b62ad464eed96e844e33a990d;p=portage.git As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree. svn path=/main/trunk/; revision=6062 --- diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 03b3031de..8c418447d 100644 --- 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"])