From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 24 Feb 2007 00:57:51 +0000 (-0000)
Subject: Allow --verbose to trigger a merge list even without --pretend, --ask, or --tree... 
X-Git-Tag: v2.1.2.1~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=76b434da3e9e219443bd672237a74c4db9705162;p=portage.git

Allow --verbose to trigger a merge list even without --pretend, --ask, or --tree.  Thanks to agaffney and zlin for the suggestion. (trunk r6065:6066)

svn path=/main/branches/2.1.2/; revision=6067
---

diff --git a/bin/emerge b/bin/emerge
index 4193a9bff..b9a3fa6bf 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -4620,7 +4620,8 @@ def action_build(settings, trees, mtimedb,
 	ldpath_mtimes = mtimedb["ldpath"]
 	favorites=[]
 	if "--quiet" not in myopts and \
-		("--pretend" in myopts or "--ask" in myopts or "--tree" in myopts):
+		("--pretend" in myopts or "--ask" in myopts or \
+		"--tree" in myopts or "--verbose" in myopts):
 		action = ""
 		if "--fetchonly" in myopts or "--fetch-all-uri" in myopts:
 			action = "fetched"
@@ -4710,7 +4711,8 @@ def action_build(settings, trees, mtimedb,
 			sys.exit(1)
 
 	if "--pretend" not in myopts and \
-		("--ask" in myopts or "--tree" in myopts) and \
+		("--ask" in myopts or "--tree" in myopts or \
+		"--verbose" in myopts) and \
 		not ("--quiet" in myopts and "--ask" not in myopts):
 		if "--resume" in myopts:
 			validate_merge_list(trees, mtimedb["resume"]["mergelist"])