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

svn path=/main/trunk/; revision=6066

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index dc63b6b101791de427f1ddd2af7e5f63740989a9..5a6e2ba527e7892316f71dca7a6471b0570ee53f 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -4680,7 +4680,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"
@@ -4770,7 +4771,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"])