Allow --verbose to trigger a merge list even without --pretend, --ask, or --tree...

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

diff --git a/bin/emerge b/bin/emerge
index 4193a9bff961e0459623bfa3edb08612e6363ebf..b9a3fa6bf29e1cdb0d0f4902bdfdc4f8c8a1ca39 100755 (executable)
--- 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"])