[gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/revdep_rebuild/

[Brian Dolbec]

commit:     d9f4c8c06b9536de14d5b0d88c32957755df6108
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 18:24:16 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Feb 11 18:24:16 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=d9f4c8c0

revdep_rebuild: Add logger parameter to scan_files(), scan()

Convert earlier debug print()s to logging.

---
 pym/gentoolkit/revdep_rebuild/analyse.py | 13 ++++++-------
 pym/gentoolkit/revdep_rebuild/stuff.py   |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index c416c3c..c774d9f 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -16,14 +16,15 @@ from .assign import assign_packages
 from .cache import save_cache
 
 
-def scan_files(libs_and_bins, cmd_max_args):
+def scan_files(libs_and_bins, cmd_max_args, logger):
 
 	scanned_files = {} # {bits: {soname: (filename, needed), ...}, ...}
-	for line in scan(['-nBF', '%F %f %S %n %M'], libs_and_bins, cmd_max_args):
+	for line in scan(['-nBF', '%F %f %S %n %M'],
+					 libs_and_bins, cmd_max_args, logger):
 		parts = line.split(' ')
 		if len(parts) < 5:
-			print("scan_files(); error processing lib: %s" % line)
-			print("scan_files(); parts = %s" % str(parts))
+			logger.error("scan_files(); error processing lib: %s" % line)
+			logger.error("scan_files(); parts = %s" % str(parts))
 			continue
 		filename, sfilename, soname, needed, bits = parts
 		filename = os.path.realpath(filename)
@@ -41,8 +42,6 @@ def scan_files(libs_and_bins, cmd_max_args):
 		else:
 			scanned_files[bits][soname][filename].update(needed)
 
-	#print("scanned_files['64'] =")
-	#print(scanned_files['64'])
 	return scanned_files
 
 
@@ -184,7 +183,7 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 
 	libs_and_bins = set(libraries + binaries)
 
-	scanned_files = scan_files(libs_and_bins, settings['CMD_MAX_ARGS'])
+	scanned_files = scan_files(libs_and_bins, settings['CMD_MAX_ARGS'], logger)
 
 	logger.warn(green(' * ') + bold('Checking dynamic linking consistency'))
 	logger.debug('analyse(), Searching for %i libs, bins within %i libraries and links' %

diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py
index 7f8c574..0608702 100644
--- a/pym/gentoolkit/revdep_rebuild/stuff.py
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py
@@ -24,7 +24,7 @@ def call_program(args):
 	return str(stdout)
 
 
-def scan(params, files, max_args):
+def scan(params, files, max_args, logger):
 	''' Calls scanelf with given params and files to scan.
 		@param params is list of parameters that should
 			be passed into scanelf app.
@@ -36,8 +36,8 @@ def scan(params, files, max_args):
 
 		@return scanelf output (joined if was called several times)
 	'''
-	#print("SCAN(), params = ", params, len(files))
-	# change it to a list for group processing
+	logger.debug("      scan(), scanelf params = %s, # files: %d" % (params, len(files)))
+	# change it to a sorted list for group processing
 	_files = sorted(files)
 	out = []
 	for i in range(0, len(_files), max_args):
@@ -46,7 +46,7 @@ def scan(params, files, max_args):
 		output = [x for x in output if x != '']
 		if output:
 			out.extend(output)
-	#print("SCAN(), final output length:", len(out))
+	logger.debug("      scan(), final output length: %d" % len(out))
 	return out