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 446441388BF for ; Wed, 6 Jan 2016 04:22:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9EAE321C02D; Wed, 6 Jan 2016 04:22:02 +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 29BB621C031 for ; Wed, 6 Jan 2016 04:21:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CA43340A75 for ; Wed, 6 Jan 2016 04:21:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A0A65E62 for ; Wed, 6 Jan 2016 04:21:52 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1452053305.b8183b8bd1f106e58080b2871f4b3f6e6aaf67f5.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/main.py pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b8183b8bd1f106e58080b2871f4b3f6e6aaf67f5 X-VCS-Branch: repoman Date: Wed, 6 Jan 2016 04:21:52 +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: 43436f5f-6e98-4d96-ba3c-bd6a35a6e999 X-Archives-Hash: b8f7469fb018bb7864e685f32e11b405 commit: b8183b8bd1f106e58080b2871f4b3f6e6aaf67f5 Author: Brian Dolbec gentoo org> AuthorDate: Mon Jan 4 19:04:36 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Wed Jan 6 04:08:25 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=b8183b8b repoman/main.py: Enable verbosity option to be useful for setting the logging level Verbosity option was not being used internally. Fix debug print's added to proper debug messages. pym/repoman/main.py | 13 ++++++++++--- pym/repoman/scanner.py | 44 ++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 8784685..d43a688 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -19,7 +19,6 @@ from portage import os import portage.checksum import portage.const import portage.repository.config -from portage import util from portage.output import create_color_func, nocolor from portage.output import ConsoleStyleFile, StyleWriter from portage.util import formatter @@ -38,13 +37,14 @@ from repoman.modules.vcs.settings import VCSSettings if sys.hexversion >= 0x3000000: basestring = str -util.initialize_logger() - bad = create_color_func("BAD") # A sane umask is needed for files that portage creates. os.umask(0o22) +LOGLEVEL = logging.WARNING +portage.util.initialize_logger(LOGLEVEL) + def repoman_main(argv): config_root = os.environ.get("PORTAGE_CONFIGROOT") @@ -62,6 +62,13 @@ def repoman_main(argv): print("Portage", portage.VERSION) sys.exit(0) + logger = logging.getLogger() + + if options.verbosity > 0: + logger.setLevel(LOGLEVEL - 10 * options.verbosity) + else: + logger.setLevel(LOGLEVEL) + if options.experimental_inherit == 'y': # This is experimental, so it's non-fatal. qawarnings.add("inherit.missing") diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index cfc6802..c4979b8 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -19,13 +19,13 @@ from portage.module import Modules MODULES_PATH = os.path.join(os.path.dirname(__file__), "modules", "scan") # initial development debug info -#print("module path:", path) +logging.debug("module path: %s", MODULES_PATH) MODULE_CONTROLLER = Modules(path=MODULES_PATH, namepath="repoman.modules.scan") -# initial development debug info -#print(module_controller.module_names) MODULE_NAMES = MODULE_CONTROLLER.module_names[:] +# initial development debug info +logging.debug("module_names: %s", MODULE_NAMES) class Scanner(object): @@ -196,10 +196,10 @@ class Scanner(object): self.modules = {} pkg_modules = ['manifests', 'isebuild', 'keywords', 'files', 'vcsstatus', 'fetches', 'pkgmetadata'] - print("Initializing pkg class names:", pkg_modules) + logging.debug("Initializing pkg class names: %s", pkg_modules) for mod in pkg_modules: mod_class = MODULE_CONTROLLER.get_class(mod) - print("Initializing class name:", mod_class.__name__) + logging.debug("Initializing class name: %s", mod_class.__name__) self.modules[mod_class.__name__] = mod_class(**self.kwargs) def scan_pkgs(self, can_force): @@ -207,7 +207,7 @@ class Scanner(object): for xpkg in self.effective_scanlist: xpkg_continue = False # ebuilds and digests added to cvs respectively. - logging.info("checking package %s" % xpkg) + logging.info("checking package %s", xpkg) # save memory by discarding xmatch caches from previous package(s) self.caches['arch_xmatch'].clear() self.eadded = [] @@ -235,7 +235,7 @@ class Scanner(object): # need to set it up for ==> self.modules or some other ordered list for mod in ['Manifests', 'IsEbuild', 'KeywordChecks', 'FileChecks', 'VCSStatus', 'FetchChecks', 'PkgMetadata']: - print("scan_pkgs(): module:", mod) + logging.debug("scan_pkgs; module: %s", mod) do_it, functions = self.modules[mod].runInPkgs if do_it: for func in functions: @@ -294,14 +294,14 @@ class Scanner(object): ]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) - print("Initializing class name:", mod_class.__name__) + logging.debug("Initializing class name: %s", mod_class.__name__) self.modules[mod[1]] = mod_class(**self.kwargs) - print("scan_ebuilds: module:", mod[1]) + logging.debug("scan_ebuilds: module: %s", mod[1]) do_it, functions = self.modules[mod[1]].runInEbuilds - # print("do_it", do_it, "functions", functions) + logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions]) if do_it: for func in functions: - print("\tRunning function:", func) + logging.debug("\tRunning function: %s", func) rdata = func(**dynamic_data) if rdata['continue']: # If we can't access all the metadata then it's totally unsafe to @@ -310,16 +310,16 @@ class Scanner(object): # metadata leads to false positives for several checks, and false # positives confuse users. y_ebuild_continue = True - print("\t>>> Continuing") + # logging.debug("\t>>> Continuing") break - #print("rdata:", rdata) + # logging.debug("rdata: %s", rdata) dynamic_data.update(rdata) - #print("dynamic_data", dynamic_data) + # logging.debug("dynamic_data: %s", dynamic_data) if y_ebuild_continue: continue - print("**** finished ebuild plugin loop, continuing...") + logging.debug("Finished ebuild plugin loop, continuing...") # Final checks # initialize per pkg plugin final checks here @@ -328,22 +328,22 @@ class Scanner(object): for mod in [('unused', 'UnusedChecks')]: if mod[0]: mod_class = MODULE_CONTROLLER.get_class(mod[0]) - print("Initializing class name:", mod_class.__name__) + logging.debug("Initializing class name: %s", mod_class.__name__) self.modules[mod[1]] = mod_class(**self.kwargs) - print("scan_ebuilds final checks: module:", mod[1]) + logging.debug("scan_ebuilds final checks: module: %s", mod[1]) do_it, functions = self.modules[mod[1]].runInFinal - # print("do_it", do_it, "functions", functions) + logging.debug("do_it: %s, functions: %s", do_it, [x.__name__ for x in functions]) if do_it: for func in functions: - print("\tRunning function:", func) + logging.debug("\tRunning function: %s", func) rdata = func(**dynamic_data) if rdata['continue']: xpkg_complete = True - print("\t>>> Continuing") + # logging.debug("\t>>> Continuing") break - #print("rdata:", rdata) + # logging.debug("rdata: %s", rdata) dynamic_data.update(rdata) - #print("dynamic_data", dynamic_data) + # logging.debug("dynamic_data: %s", dynamic_data) if xpkg_complete: return