[gentoo-commits] proj/portage:repoman commit in: pym/repoman/

[Brian Dolbec]

commit:     9ff97354f8b8666b1b391422e43618cf55894d7e
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 05:33:17 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 07:50:21 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9ff97354

repoman: Enable verbosity option to be useful for setting the logging level

Verbosity option was not being used internally.
Convert debug print's added to proper debug messages.

 pym/repoman/main.py    | 13 ++++++++++---
 pym/repoman/scanner.py | 35 +++++++++++++++++++----------------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 890e034..6921005 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
@@ -37,13 +36,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")
@@ -61,6 +61,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 4dd5408..8623812 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):
@@ -200,7 +200,7 @@ class Scanner(object):
 		for mod in ['manifests', 'isebuild', 'keywords', 'files', 'vcsstatus',
 					'fetches', 'pkgmetadata']:
 			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):
@@ -208,7 +208,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 = []
@@ -236,7 +236,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:
@@ -300,7 +300,7 @@ class Scanner(object):
 				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.get('continue', False):
 							# If we can't access all the metadata then it's totally unsafe to
@@ -309,14 +309,17 @@ class Scanner(object):
 							# metadata leads to false positives for several checks, and false
 							# positives confuse users.
 							y_ebuild_continue = True
+							# 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
 
+			logging.debug("Finished ebuild plugin loop, continuing...")
+
 		# Final checks
 		# initialize per pkg plugin final checks here
 		# need to set it up for ==> self.modules_list or some other ordered list
@@ -324,22 +327,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.get('continue', False):
 						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