revdep_rebuild: Unify debug and detail output for a more consistent look.

6 files changed, 28 insertions, 26 deletions

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index daeb4fc..b5daff9 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -23,8 +23,8 @@ def scan_files(libs_and_bins, cmd_max_args, logger):
 					 libs_and_bins, cmd_max_args, logger):
 		parts = line.split(' ')
 		if len(parts) < 5:
-			logger.error("scan_files(); error processing lib: %s" % line)
-			logger.error("scan_files(); parts = %s" % str(parts))
+			logger.error("\tscan_files(); error processing lib: %s" % line)
+			logger.error("\tscan_files(); parts = %s" % str(parts))
 			continue
 		filename, sfilename, soname, needed, bits = parts
 		filename = os.path.realpath(filename)
@@ -86,7 +86,7 @@ def extract_dependencies_from_la(la, libraries, to_check, logger):
 								if not _break:
 									continue
 
-							logger.info(yellow(' * ') + _file +
+							logger.info('\t' + yellow(' * ') + _file +
 								' is broken (requires: ' + bold(el)+')')
 							broken.append(_file)
 	return broken
@@ -244,7 +244,7 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 			)
 
 
-	logger.debug('      analyse(), Found %i libraries (+%i symlinks) and %i binaries' %
+	logger.debug('\tanalyse(), Found %i libraries (+%i symlinks) and %i binaries' %
 		(len(libraries), len(libraries_links), len(binaries))
 	)
 	logger.info(green(' * ') + bold('Scanning files'))
@@ -254,8 +254,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 	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' %
-		(len(libs_and_bins), len(libraries)+len(libraries_links))
+	logger.debug(
+		'\tanalyse(), Searching for %i libs, bins within %i libraries and links'
+		% (len(libs_and_bins), len(libraries)+len(libraries_links))
 	)
 
 	libcheck = LibCheck(scanned_files, logger, _libs_to_check)
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py
index 8575532..5704974 100644
--- a/pym/gentoolkit/revdep_rebuild/assign.py
+++ b/pym/gentoolkit/revdep_rebuild/assign.py
@@ -45,7 +45,8 @@ def assign_packages(broken, logger, settings):
 									found = group+'/'+pkg
 									assigned_pkgs.add(found)
 									assigned_filenames.add(m)
-									logger.info('\t' + m + ' -> ' + bold(found))
+									logger.info('\t' + green('* ') + m +
+												' -> ' + bold(found))
 				except Exception as e:
 					logger.warn(red(' !! Failed to read ' + f))
 					logger.warn(red(' !! Error was:' + str(e)))
@@ -67,20 +68,20 @@ def get_best_match(cpv, cp, logger):
 	"""
 
 	slot = portage.db[portage.root]["vartree"].dbapi.aux_get(cpv, ["SLOT"])
-	logger.warn(yellow('Warning: ebuild "' + cpv + '" not found.'))
-	logger.info('Looking for %s:%s' %(cp, slot))
+	logger.warn('\t' + yellow('Warning: ebuild "' + cpv + '" not found.'))
+	logger.info('\tLooking for %s:%s' %(cp, slot))
 	try:
 		match = portdb.match('%s:%s' %(cp, slot))
 	except portage.exception.InvalidAtom:
 		match = None
 
 	if not match:
-		logger.warn(red('!!') + ' ' + yellow(
+		logger.warn('\t' + red('!!') + ' ' + yellow(
 			'Could not find ebuild for %s:%s' %(cp, slot)))
 		slot = ['']
 		match = portdb.match(cp)
 		if not match:
-			logger.warn(red('!!') + ' ' +
+			logger.warn('\t' + red('!!') + ' ' +
 				yellow('Could not find ebuild for ' + cp))
 	return match, slot
 
@@ -100,7 +101,7 @@ def get_slotted_cps(cpvs, logger):
 		except KeyError:
 			match, slot = get_best_match(cpv, cp, logger)
 			if not match:
-				logger.warn(red("Installed package: "
+				logger.warn('\t' + red("Installed package: "
 					"%s is no longer available" %cp))
 				continue
 
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py
index 862638d..49ddc10 100644
--- a/pym/gentoolkit/revdep_rebuild/cache.py
+++ b/pym/gentoolkit/revdep_rebuild/cache.py
@@ -62,7 +62,7 @@ def save_cache(logger, to_save={}, temp_path=DEFAULTS['DEFAULT_TMP_DIR']):
 				_file.write(line + '\n')
 			_file.close()
 	except Exception as ex:
-		logger.warn(red('Could not save cache: %s' %str(ex)))
+		logger.warn('\t' + red('Could not save cache: %s' %str(ex)))
 
 
 
@@ -90,7 +90,7 @@ def check_temp_files(temp_path=DEFAULTS['DEFAULT_TMP_DIR'], max_delay=3600,
 		_file .close()
 	except Exception as ex:
 		if logger:
-			logger.debug("check_temp_files(); error retrieving"
+			logger.debug("\tcheck_temp_files(); error retrieving"
 				" timestamp_path:\n" + str(ex))
 		timestamp = 0
 		return False
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py
index a044398..c4c7a40 100644
--- a/pym/gentoolkit/revdep_rebuild/collect.py
+++ b/pym/gentoolkit/revdep_rebuild/collect.py
@@ -51,7 +51,7 @@ def parse_conf(conf_file, visited=None, logger=None):
 					else:
 						lib_dirs.add(line)
 		except EnvironmentError:
-			logger.warn(yellow('Error when parsing file %s' %conf))
+			logger.warn('\t' + yellow('Error when parsing file %s' %conf))
 
 	if visited is None:
 		visited = set()
@@ -81,7 +81,7 @@ def prepare_search_dirs(logger, settings):
 			if match is not None:
 				bin_dirs.update(set(match.group(2).split(':')))
 	#except EnvironmentError:
-		#logger.debug(yellow('Could not open file %s' % f))
+		#logger.debug('\t' + yellow('Could not open file %s' % f))
 
 	lib_dirs = parse_conf(settings['DEFAULT_LD_FILE'], logger=logger)
 	return (bin_dirs, lib_dirs)
@@ -189,8 +189,8 @@ def collect_libraries_from_dir(dirs, mask, logger):
 									prv & stat.S_IXOTH == stat.S_IXOTH:
 								found_files.append(listing)
 		except Exception as ex:
-			logger.debug(
-				yellow('      Exception during collecting libraries: ' +
+			logger.debug('\t' +
+				yellow('Exception during collecting libraries: ' +
 				blue('%s')  %str(ex)))
 
 	if found_directories:
@@ -242,7 +242,7 @@ def collect_binaries_from_dir(dirs, mask, logger):
 								prv & stat.S_IXOTH == stat.S_IXOTH:
 							found_files.append(listing)
 		except Exception as ex:
-			logger.debug(
+			logger.debug('\t' +
 				yellow('Exception during binaries collecting: '+
 				blue('%s') %str(ex)))
 
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py
index 21ede45..37909b1 100644
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py
@@ -217,6 +217,8 @@ def main(settings=None, logger=None):
 			'If you\'re sure, you can add --no-pretend to revdep options')
 		settings['PRETEND'] = True
 
+	logger.debug("\tmain(), _libs_to_check = %s" % str(_libs_to_check))
+
 	if settings['USE_TMP_FILES'] \
 			and check_temp_files(settings['DEFAULT_TMP_DIR'], logger=logger):
 		libraries, la_libraries, libraries_links, binaries = read_cache(
@@ -239,24 +241,22 @@ def main(settings=None, logger=None):
 	elif orphaned:
 		# blank line for beter visibility of the following lines
 		logger.warn('')
-		logger.warn(red('!!! Broken orphaned files: ') +
-			bold('No installed package was found for the following:'))
 		for filename in orphaned:
-			logger.warn(red(' * ') + filename)
+			logger.warn(red('\t* ') + filename)
 
 	has_masked = False
 	tmp = []
 	for ebuild in assigned:
 		if get_masking_status(ebuild):
 			has_masked = True
-			logger.warn('!!! ' + red('All ebuilds that could satisfy: ') +
+			logger.warn(' !!! ' + red('All ebuilds that could satisfy: ') +
 				green(ebuild) + red(' have been masked'))
 		else:
 			tmp.append(ebuild)
 	assigned = tmp
 
 	if has_masked:
-		logger.info(red(' * ') +
+		logger.info('\t' + red('* ') +
 			'Unmask all ebuild(s) listed above and call revdep-rebuild '
 			'again or manually emerge given packages.')
 
diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py
index 0608702..e0fc7b5 100644
--- a/pym/gentoolkit/revdep_rebuild/stuff.py
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py
@@ -36,7 +36,7 @@ def scan(params, files, max_args, logger):
 
 		@return scanelf output (joined if was called several times)
 	'''
-	logger.debug("      scan(), scanelf params = %s, # files: %d" % (params, len(files)))
+	logger.debug("\tscan(), scanelf params = %s, # files: %d" % (params, len(files)))
 	# change it to a sorted list for group processing
 	_files = sorted(files)
 	out = []
@@ -46,7 +46,7 @@ def scan(params, files, max_args, logger):
 		output = [x for x in output if x != '']
 		if output:
 			out.extend(output)
-	logger.debug("      scan(), final output length: %d" % len(out))
+	logger.debug("\tscan(), final output length: %d" % len(out))
 	return out