revdep_rebuild: Initial pyflakes import and variable cleanup.

Comment out some unused code for now which were causing some variable errors in pyflakes.

2 files changed, 27 insertions, 32 deletions

diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py
index a32ea05..4b79c2b 100644
--- a/pym/gentoolkit/revdep_rebuild/analyse.py
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py
@@ -6,8 +6,6 @@ from __future__ import print_function
 
 import os
 import re
-import platform
-import glob
 
 from portage.output import bold, blue, yellow, green
 
@@ -56,7 +54,6 @@ def prepare_checks(files_to_check, libraries, bits, cmd_max_args):
 
 
 def scan_files(libs_and_bins, cmd_max_args):
-	import os
 
 	scanned_files = {} # {bits: {soname: (filename, needed), ...}, ...}
 	for line in scan(['-nBF', '%F %f %S %n %M'], libs_and_bins, cmd_max_args):
@@ -184,7 +181,7 @@ def main_checks(found_libs, broken_list, dependencies, logger):
 
 	for broken in broken_list:
 		found = found_libs[broken]
-		logger.info('Broken files that requires: ' + bold(f))
+		logger.info('Broken files that requires: ' + bold(found))
 		for dep_path in dependencies[broken]:
 			logger.info(yellow(' * ') + dep_path)
 			broken_pathes.append(dep_path)
@@ -276,9 +273,9 @@ def analyse(settings, logger, libraries=None, la_libraries=None,
 
 	return assign_packages(broken_pathes, logger, settings)
 
-	import sys
-	sys.exit()
 	
+	#import sys
+	#sys.exit()
 	#l = []
 	#for line in call_program(['scanelf', '-M', '64', '-BF', '%F',] + libraries).strip().split('\n'):
 		#l.append(line)
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py
index 2a93fe1..4842ea9 100644
--- a/pym/gentoolkit/revdep_rebuild/assign.py
+++ b/pym/gentoolkit/revdep_rebuild/assign.py
@@ -10,11 +10,9 @@ import os
 import re
 
 import portage
-from portage.versions import catpkgsplit
 from portage import portdb
 from portage.output import bold, red, yellow
-from gentoolkit.helpers import get_installed_cpvs
-from gentoolkit.package import Package
+#from gentoolkit.package import Package
 
 # Make all str conversions unicode
 try:
@@ -47,29 +45,29 @@ def assign_packages(broken, logger, settings):
 
 	return assigned
 
-	# Map all files in CONTENTS database to package names
-	fname_pkg_dict = {}
-	for pkg in pkgset:
-		contents = Package(pkg).parsed_contents()
-		for fname in contents.keys():
-			if contents[fname][0] == "obj":
-				fname_pkg_dict[fname] = str(pkg)
-
-	for fname in broken:
-		realname = os.path.realpath(fname)
-		if realname in fname_pkg_dict.keys():
-			pkgname = fname_pkg_dict[realname]
-		elif fname in fname_pkg_dict.keys():
-			pkgname = fname_pkg_dict[fname]
-		else:
-			pkgname = None
-		if pkgname and pkgname not in assigned:
-			assigned.add(pkgname)
-		if not pkgname:
-			pkgname = "(none)"
-		logger.info('\t' + fname + ' -> ' + bold(pkgname))
-
-	return assigned
+	## Map all files in CONTENTS database to package names
+	#fname_pkg_dict = {}
+	#for pkg in pkgset:
+		#contents = Package(pkg).parsed_contents()
+		#for fname in contents.keys():
+			#if contents[fname][0] == "obj":
+				#fname_pkg_dict[fname] = str(pkg)
+
+	#for fname in broken:
+		#realname = os.path.realpath(fname)
+		#if realname in fname_pkg_dict.keys():
+			#pkgname = fname_pkg_dict[realname]
+		#elif fname in fname_pkg_dict.keys():
+			#pkgname = fname_pkg_dict[fname]
+		#else:
+			#pkgname = None
+		#if pkgname and pkgname not in assigned:
+			#assigned.add(pkgname)
+		#if not pkgname:
+			#pkgname = "(none)"
+		#logger.info('\t' + fname + ' -> ' + bold(pkgname))
+
+	#return assigned
 
 def get_best_match(cpv, cp, logger):
 	"""Tries to find another version of the pkg with the same slot