From 3962a56122fcea948b851bf122c869d2555559c2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 23 Feb 2007 23:40:24 +0000 Subject: As requested by solar, never show a merge list unless it's explicitly requested by --ask, --pretend, or --tree. svn path=/main/branches/2.1.2/; revision=6063 --- bin/emerge | 1 + 1 file changed, 1 insertion(+) (limited to 'bin') diff --git a/bin/emerge b/bin/emerge index 1fa1a2dc6..fdd9c504b 100755 --- a/bin/emerge +++ b/bin/emerge @@ -4709,6 +4709,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"]) -- cgit v1.2.3-1-g7c22