From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDPUc-0001ir-6u for garchives@archives.gentoo.org; Mon, 10 Oct 2011 23:42:46 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9FAD21C02D; Mon, 10 Oct 2011 23:42:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6BFC921C09F for ; Mon, 10 Oct 2011 23:42:37 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E286F1B4019 for ; Mon, 10 Oct 2011 23:42:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 43CCE80042 for ; Mon, 10 Oct 2011 23:42:36 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <24f72fe5d67a7bd2af60b7b50a78c03eea4e29c7.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: scripts/ X-VCS-Repository: proj/elfix X-VCS-Files: scripts/revdep-pax X-VCS-Directories: scripts/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 24f72fe5d67a7bd2af60b7b50a78c03eea4e29c7 Date: Mon, 10 Oct 2011 23:42:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 2262c94d9e8d7454c1706ee1abf4fd77 commit: 24f72fe5d67a7bd2af60b7b50a78c03eea4e29c7 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Oct 10 23:42:31 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Oct 10 23:42:31 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D= commit;h=3D24f72fe5 scripts/revdep-pax: code and variable name cleanup --- scripts/revdep-pax | 67 ++++++++++++++++++++++++++++++++--------------= ----- 1 files changed, 42 insertions(+), 25 deletions(-) diff --git a/scripts/revdep-pax b/scripts/revdep-pax index 4e35f1e..75ec724 100755 --- a/scripts/revdep-pax +++ b/scripts/revdep-pax @@ -8,13 +8,16 @@ import re import pax =20 def get_ldd_linkings(binary): + try: - #When subprocess.DEVNULL makes it to python, change this: http://bugs.= python.org/issue5870 + #TODO: when subprocess.DEVNULL makes it to python, change this: http:/= /bugs.python.org/issue5870 ldd_output =3D subprocess.check_output(['/usr/bin/ldd', binary], stder= r=3Dsubprocess.PIPE) except: - # We should record these binaries which are probably statically linked + #TODO: we should record these binaries which are probably statically l= inked return [] + ldd_lines =3D ldd_output.split('\n') + linkings =3D [] mappings =3D {} for m in range(0,len(ldd_lines)): @@ -30,14 +33,16 @@ def get_ldd_linkings(binary): library =3D os.path.realpath(library) linkings.append(soname) mappings[soname] =3D library=20 + return ( linkings, mappings ) =20 =20 def get_forward_linkings(): - # I'm still not sure we wan to use /var/db/pkg vs some path of binaries + #TODO: I'm still not sure we wan to use /var/db/pkg vs some path of bin= aries var_db_pkg =3D '/var/db/pkg' + forward_linkings =3D {} - so2filename_mappings =3D {} + so2library_mappings =3D {} for cat in os.listdir(var_db_pkg): catdir =3D '%s/%s' % (var_db_pkg, cat) for pkg in os.listdir(catdir): @@ -52,11 +57,11 @@ def get_forward_linkings(): binary =3D link[0] ( linkings, mappings ) =3D get_ldd_linkings(binary) forward_linkings[binary] =3D linkings=20 - so2filename_mappings.update(mappings) + so2library_mappings.update(mappings) except: continue =20 - return ( forward_linkings, so2filename_mappings ) + return ( forward_linkings, so2library_mappings ) =20 =20 def invert_linkings( forward_linkings ): @@ -72,7 +77,7 @@ def invert_linkings( forward_linkings ): return reverse_linkings=20 =20 =20 -def print_forward_linkings( forward_linkings, so2filename_mappings, verb= ose ): +def print_forward_linkings( forward_linkings, so2library_mappings, verbo= se ): missing_binaries =3D [] missing_links =3D [] for binary in forward_linkings: @@ -87,7 +92,7 @@ def print_forward_linkings( forward_linkings, so2filena= me_mappings, verbose ): count =3D 0 for soname in forward_linkings[binary]: try: - library =3D so2filename_mappings[soname] + library =3D so2library_mappings[soname] library_flags =3D pax.getflags(library) s =3D "%s\n\t%s\t%s ( %s )" % ( s, soname, library, library_flags ) if binary_flags !=3D library_flags: @@ -103,33 +108,38 @@ def print_forward_linkings( forward_linkings, so2fi= lename_mappings, verbose ): if count !=3D 0: print s =20 + print + missing_binaries =3D set(missing_binaries) - print '\n\n' + print + print print '**** Missing binaries ****' for m in missing_binaries: print m =20 missing_links =3D set(missing_links) - print '\n\n' + print + print print '**** Missing forward linkings ****' for m in missing_links: print m =20 - print '\n\n' + print + print =20 =20 -def print_reverse_linkings( reverse_linkings, so2filename_mappings, verb= ose ): +def print_reverse_linkings( reverse_linkings, so2library_mappings, verbo= se ): missing_sonames =3D [] missing_links =3D [] =20 for soname in reverse_linkings: =20 try: - library =3D so2filename_mappings[soname] + library =3D so2library_mappings[soname] library_flags =3D pax.getflags(library) s =3D "%s\t%s ( %s )" % ( soname, library, library_flags ) except: - missing_libraries.append(soname) + missing_sonames.append(soname) continue =20 count =3D 0 @@ -150,19 +160,23 @@ def print_reverse_linkings( reverse_linkings, so2fi= lename_mappings, verbose ): if count !=3D 0: print s =20 + print + missing_sonames =3D set(missing_sonames) - print '\n\n' + print + print print '**** Missing sonames ****' for m in missing_sonames: print m =20 missing_links =3D set(missing_links) - print '\n\n' + print + print print '**** Missing reverse linkings ****' for m in missing_links: print m - - print '\n\n' + print + print =20 =20 def run_usage(): @@ -183,14 +197,14 @@ def run_usage(): =20 =20 def run_forward(verbose): - ( forward_linkings, so2filename_mappings ) =3D get_forward_linkings() - print_forward_linkings( forward_linkings, so2filename_mappings, verbose= ) + ( forward_linkings, so2library_mappings ) =3D get_forward_linkings() + print_forward_linkings( forward_linkings, so2library_mappings, verbose) =20 =20 def run_reverse(verbose): - ( forward_linkings, so2filename_mappings ) =3D get_forward_linkings() + ( forward_linkings, so2library_mappings ) =3D get_forward_linkings() reverse_linkings =3D invert_linkings( forward_linkings ) - print_reverse_linkings( reverse_linkings, so2filename_mappings, verbose= ) + print_reverse_linkings( reverse_linkings, so2library_mappings, verbose = ) =20 =20 def run_binary(binary, verbose): @@ -219,10 +233,10 @@ def run_binary(binary, verbose): =20 =20 def run_soname(soname, verbose): - ( forward_linkings, so2filename_mappings ) =3D get_forward_linkings() + ( forward_linkings, so2library_mappings ) =3D get_forward_linkings() reverse_linkings =3D invert_linkings( forward_linkings ) linkings =3D reverse_linkings[soname] - library =3D so2filename_mappings[soname] + library =3D so2library_mappings[soname] =20 library_flags =3D pax.getflags(library) print soname, '\t', library, '(', library_flags, ')' @@ -241,7 +255,8 @@ def run_soname(soname, verbose): print "cannot obtain pax flags for %s" % binary =20 if count =3D=3D 0: - print '\nNo mismatches' + print + print 'No mismatches' =20 def main(): try: @@ -282,6 +297,8 @@ def main(): print 'Please file a bug' sys.exit(1) =20 + #TODO: Add code to only allow one of -h, -f -r -b -s + if do_usage: run_usage() =20