From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 4F03F1381F4 for ; Sat, 8 Dec 2012 09:25:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C7F9E04EB; Sat, 8 Dec 2012 09:25:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 869F6E04EB for ; Sat, 8 Dec 2012 09:25:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 970C133DE41 for ; Sat, 8 Dec 2012 09:25:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D7008E543C for ; Sat, 8 Dec 2012 09:25:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1354958692.184b2ed92e83491b81b5894814e6935e870133df.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: man/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: man/emerge.1 pym/_emerge/main.py X-VCS-Directories: man/ pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 184b2ed92e83491b81b5894814e6935e870133df X-VCS-Branch: master Date: Sat, 8 Dec 2012 09:25:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 976149be-66f0-40b6-a763-870577269dfc X-Archives-Hash: 4dad5544dd56d59ab5db1b6e5a8c4a0a commit: 184b2ed92e83491b81b5894814e6935e870133df Author: Zac Medico gentoo org> AuthorDate: Sat Dec 8 09:24:52 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Dec 8 09:24:52 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=184b2ed9 emerge --verbose: [ y | n ] for bug #446324 --- man/emerge.1 | 4 ++-- pym/_emerge/main.py | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/man/emerge.1 b/man/emerge.1 index 850a241..cd54dab 100644 --- 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 cdadbec..6223a13 100644 --- 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: