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 B1743138B32 for ; Sat, 25 Jan 2014 22:01:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F226BE09D7; Sat, 25 Jan 2014 22:01:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70020E0A02 for ; Sat, 25 Jan 2014 22:01:00 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BF9933F15B for ; Sat, 25 Jan 2014 22:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id CC1D218060 for ; Sat, 25 Jan 2014 22:00:57 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1390248318.a8d9d1e301afbdd794d3a95f0ef61e78ca39edcf.vapier@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/ekeyword/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: src/ekeyword/ekeyword.py src/ekeyword/ekeyword_unittest.py X-VCS-Directories: src/ekeyword/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: a8d9d1e301afbdd794d3a95f0ef61e78ca39edcf X-VCS-Branch: gentoolkit-dev Date: Sat, 25 Jan 2014 22:00:57 +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: 8558bd94-791d-4280-ba88-0fc508c5cfa5 X-Archives-Hash: 30ad4dff7fc21bb8a909f6b55edb99e4 commit: a8d9d1e301afbdd794d3a95f0ef61e78ca39edcf Author: Mike Frysinger gentoo org> AuthorDate: Mon Jan 20 20:05:18 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Jan 20 20:05:18 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=a8d9d1e3 ekeyword: make quiet/verbose flags a bit more flexible This allows for multiple levels of verbose/quiet. --- src/ekeyword/ekeyword.py | 16 ++++++++-------- src/ekeyword/ekeyword_unittest.py | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py index 66cf48a..7a6c630 100755 --- a/src/ekeyword/ekeyword.py +++ b/src/ekeyword/ekeyword.py @@ -190,15 +190,15 @@ def process_keywords(keywords, ops, arch_status=None): return new_keywords -def process_content(ebuild, data, ops, arch_status=None, verbose=False, - quiet=False, format='color-inline'): +def process_content(ebuild, data, ops, arch_status=None, verbose=0, + quiet=0, format='color-inline'): """Process |ops| for |data|""" # Set up the user display style based on verbose/quiet settings. - if verbose: + if verbose > 1: disp_name = ebuild def logit(msg): print('%s: %s' % (disp_name, msg)) - elif quiet: + elif quiet > 1: def logit(msg): pass else: @@ -225,7 +225,7 @@ def process_content(ebuild, data, ops, arch_status=None, verbose=False, old_keywords, ops, arch_status=arch_status) # Finally let's present the results to the user. - if new_keywords != old_keywords: + if (new_keywords != old_keywords) or verbose: # Only do the diff work if something actually changed. updated = True old_keywords = sort_keywords(old_keywords) @@ -256,7 +256,7 @@ def process_content(ebuild, data, ops, arch_status=None, verbose=False, return updated, content -def process_ebuild(ebuild, ops, arch_status=None, verbose=False, quiet=False, +def process_ebuild(ebuild, ops, arch_status=None, verbose=0, quiet=0, dry_run=False, format='color-inline'): """Process |ops| for |ebuild|""" with open(ebuild, 'rb') as f: @@ -369,9 +369,9 @@ def get_parser(): formatter_class=argparse.RawDescriptionHelpFormatter) parser.add_argument('-n', '--dry-run', default=False, action='store_true', help='Show what would be changed, but do not commit') - parser.add_argument('-v', '--verbose', default=False, action='store_true', + parser.add_argument('-v', '--verbose', action='count', help='Be verbose while processing things') - parser.add_argument('-q', '--quiet', default=False, action='store_true', + parser.add_argument('-q', '--quiet', action='count', help='Be quiet while processing things (only show errors)') parser.add_argument('--format', default='auto', choices=('auto', 'color-inline', 'inline', 'short-multi', 'long-multi'), diff --git a/src/ekeyword/ekeyword_unittest.py b/src/ekeyword/ekeyword_unittest.py index 5096c71..00c295f 100755 --- a/src/ekeyword/ekeyword_unittest.py +++ b/src/ekeyword/ekeyword_unittest.py @@ -245,7 +245,7 @@ class TestProcessContent(unittest.TestCase): self.assertFalse(updated) self.assertEqual(ret, [' KEYWORDS=\n']) - def _testSmoke(self, format='color-inline', verbose=False, quiet=False): + def _testSmoke(self, format='color-inline', verbose=0, quiet=0): ops = ( ekeyword.Op(None, 'arm', None), ekeyword.Op('~', 'sparc', None), @@ -256,11 +256,11 @@ class TestProcessContent(unittest.TestCase): def testSmokeQuiet(self): """Smoke test for quiet mode""" - self._testSmoke(quiet=True) + self._testSmoke(quiet=10) def testSmokeVerbose(self): """Smoke test for verbose mode""" - self._testSmoke(verbose=True) + self._testSmoke(verbose=10) def testSmokeFormatColor(self): """Smoke test for color-inline format"""