emerge --verbose: [ y | n ] for bug #446324

diff --git a/man/emerge.1 b/man/emerge.1
index 850a2414bc9b648449e35db07d59286d4bebb6d1..cd54dab8e180ddc35e1b45df8f0c903997627cbf 100644 (file)
--- a/man/emerge.1
+++ b/man/emerge.1
@@ -1,4 +1,4 @@
-.TH "EMERGE" "1" "Nov 2012" "Portage VERSION" "Portage"
+.TH "EMERGE" "1" "Dec 2012" "Portage VERSION" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
 .SH "SYNOPSIS"
@@ -785,7 +785,7 @@ packages must be available at the time of dependency calculation or emerge
 will simply abort.  Portage does not use $PORTDIR when calculating dependency 
 information so all masking information is ignored.
 .TP
-.BR "\-\-verbose " (\fB\-v\fR)
+.BR "\-\-verbose [ y | n ] (\-v short option)"
 Tell emerge to run in verbose mode.  Currently this flag causes emerge to print 
 out GNU info errors, if any, and to show the USE flags that will be used for 
 each package when pretending. The following symbols are affixed to USE flags

diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index cdadbecf4956017ca9f2d1b3f2c46ce9a42385bf..6223a137d6eaed39decb7f492d42dcf434b9e5f8 100644 (file)
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -44,7 +44,6 @@ options=[
 "--tree",
 "--unordered-display",
 "--update",
-"--verbose",
 "--verbose-main-repo-display",
 ]
 
@@ -65,7 +64,7 @@ shortmapping={
 "s":"--search",    "S":"--searchdesc",
 "t":"--tree",
 "u":"--update",
-"v":"--verbose",   "V":"--version"
+"V":"--version"
 }
 
 COWSAY_MOO = """
@@ -151,6 +150,7 @@ def insert_optional_args(args):
                "--use-ebuild-visibility": y_or_n,
                '--usepkg'               : y_or_n,
                '--usepkgonly'           : y_or_n,
+               '--verbose'              : y_or_n,
        }
 
        short_arg_opts = {
@@ -168,6 +168,7 @@ def insert_optional_args(args):
                'k' : y_or_n,
                'K' : y_or_n,
                'q' : y_or_n,
+               'v' : y_or_n,
        }
 
        arg_stack = args[:]
@@ -645,6 +646,13 @@ def parse_opts(tmpcmdline, silent=False):
                        "type"     : "choice",
                        "choices"  : true_y_or_n
                },
+
+               "--verbose": {
+                       "shortopt" : "-v",
+                       "help"     : "verbose output",
+                       "type"     : "choice",
+                       "choices"  : true_y_or_n
+               },
        }
 
        from optparse import OptionParser
@@ -927,6 +935,11 @@ def parse_opts(tmpcmdline, silent=False):
        else:
                myoptions.usepkgonly = None
 
+       if myoptions.verbose in true_y:
+               myoptions.verbose = True
+       else:
+               myoptions.verbose = None
+
        for myopt in options:
                v = getattr(myoptions, myopt.lstrip("--").replace("-", "_"))
                if v: