[gentoo-commits] proj/elfix:master commit in: scripts/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     867d4048244e27cb269cf4dfeca98dad3e60da19
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 00:45:06 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 00:45:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=867d4048

scripts/revdep-pax: fixed two bugs

1) We need to continue to the next pkg not break out of the loop
when /var/db/pkg/cat/pkg/NEEDED is missing

2) print_forward_linkings needs so2filename_mappings to do its job

---
 scripts/revdep-pax |   29 ++++++++++++++++++++++++-----
 1 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/scripts/revdep-pax b/scripts/revdep-pax
index 6a28a72..98a2985 100755
--- a/scripts/revdep-pax
+++ b/scripts/revdep-pax
@@ -12,6 +12,7 @@ def get_ldd_linkings(elf):
 		#When subprocess.DEVNULL makes it to python, change this: http://bugs.python.org/issue5870
 		ldd_output = subprocess.check_output(['/usr/bin/ldd', elf], stderr=subprocess.PIPE)
 	except:
+		# We should record these elfs which are probably static
 		return []
 	ldd_lines = ldd_output.split('\n')
 	linkings = []
@@ -54,7 +55,7 @@ def get_forward_linkings():
 					for m in mappings:
 						so2filename_mappings[m[0]] = m[1]
 			except:
-				break
+				continue
 
 	return ( forward_linkings, so2filename_mappings )
 
@@ -104,7 +105,7 @@ def print_forward_linkings( forward_linkings, so2filename_mappings ):
 	print '\n\n'
 
 
-def print_reverse_linkings( reverse_linkings ):
+def print_reverse_linkings( reverse_linkings, so2filename_mappings ):
 	missing_elfs = []
 	missing_links = []
 	for elf in reverse_linkings:
@@ -152,11 +153,11 @@ def main():
 		usage()
 		sys.exit(1)
 
+	do_forward = False
+	do_reverse = False
 	binary = None
 	library = None
 
-	do_forward = False
-	do_reverse = False
 
 	for o, a in opts:
 		if o == '-h':
@@ -182,7 +183,25 @@ def main():
 	if do_reverse:
 		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
 		reverse_linkings = invert_linkings( forward_linkings )
-		print_reverse_linkings( reverse_linkings )
+		print_reverse_linkings( reverse_linkings, so2filename_mappings )
+
+	if binary != None:
+		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
+		linkings = forward_linkings[binary]
+		print linkings
+
+		"""
+		try:
+			filename = so2filename_mappings[binary]
+			flags = pax.getflags(filename)
+			print binary, '\t', filename, '(', flags, ')'
+		except:
+			print "%s doesn't link to anything that I know of" % binary
+		"""
+
+	if library !=None:
+		( forward_linkings, so2filename_mappings ) = get_forward_linkings()
+		reverse_linkings = invert_linkings( forward_linkings )
 
 if __name__ == '__main__':
     main()