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 1Rg4Me-0006tk-Hd for garchives@archives.gentoo.org; Thu, 29 Dec 2011 01:01:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0188E21C158; Thu, 29 Dec 2011 01:00:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B5E6D21C158 for ; Thu, 29 Dec 2011 01:00:47 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 165E91B404C for ; Thu, 29 Dec 2011 01:00:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8587E8004C for ; Thu, 29 Dec 2011 01:00:46 +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: <417fd4081462912c5549f10f6760ea601310dee1.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:elfix-0.4.x 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: 417fd4081462912c5549f10f6760ea601310dee1 Date: Thu, 29 Dec 2011 01:00:46 +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: 864ad761-292c-4d92-8a40-a494268d07a8 X-Archives-Hash: 0c06fbb62015c68fac2b476bf2348ab1 commit: 417fd4081462912c5549f10f6760ea601310dee1 Author: Anthony G. Basile gentoo org> AuthorDate: Wed Dec 28 15:31:22 2011 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Thu Dec 29 00:58:12 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/elfix.git;a=3D= commit;h=3D417fd408 scripts/revdep-pax: cleaned up namespace --- scripts/revdep-pax | 74 ++++++++++++++++++++++++++--------------------= ------ 1 files changed, 37 insertions(+), 37 deletions(-) diff --git a/scripts/revdep-pax b/scripts/revdep-pax index a4e9396..de1fb66 100755 --- a/scripts/revdep-pax +++ b/scripts/revdep-pax @@ -82,8 +82,8 @@ def print_forward_linkings( forward_linkings, so2librar= y_mappings, verbose ): for binary in forward_linkings: =20 try: - ( binary_flags, binary_pax_flags ) =3D pax.getflags(binary) - sv =3D '%s ( %s )\n' % ( binary, binary_flags ) + ( binary_str_flags, binary_bin_flags ) =3D pax.getflags(binary) + sv =3D '%s ( %s )\n' % ( binary, binary_str_flags ) s =3D sv except: missing_binaries.append(binary) @@ -93,10 +93,10 @@ def print_forward_linkings( forward_linkings, so2libr= ary_mappings, verbose ): for soname in forward_linkings[binary]: try: library =3D so2library_mappings[soname] - ( library_flags, library_pax_flags ) =3D pax.getflags(library) - sv =3D '%s\n\t%s\t%s ( %s )' % ( sv, soname, library, library_flags = ) - if binary_flags !=3D library_flags: - s =3D '%s\n\t%s\t%s ( %s )' % ( s, soname, library, library_flags ) + ( library_str_flags, library_bin_flags ) =3D pax.getflags(library) + sv =3D '%s\n\t%s\t%s ( %s )' % ( sv, soname, library, library_str_fl= ags ) + if binary_str_flags !=3D library_str_flags: + s =3D '%s\n\t%s\t%s ( %s )' % ( s, soname, library, library_str_fla= gs ) count =3D count + 1 except: missing_links.append(soname) @@ -130,8 +130,8 @@ def print_reverse_linkings( reverse_linkings, so2libr= ary_mappings, verbose, exec for soname in reverse_linkings: try: library =3D so2library_mappings[soname] - ( library_flags, library_pax_flags ) =3D pax.getflags(library) - sv =3D '%s\t%s ( %s )\n' % ( soname, library, library_flags ) + ( library_str_flags, library_bin_flags ) =3D pax.getflags(library) + sv =3D '%s\t%s ( %s )\n' % ( soname, library, library_str_flags ) s =3D sv except: missing_sonames.append(soname) @@ -140,17 +140,17 @@ def print_reverse_linkings( reverse_linkings, so2li= brary_mappings, verbose, exec count =3D 0 for binary in reverse_linkings[soname]: try: - ( binary_flags, binary_pax_flags ) =3D pax.getflags(binary) + ( binary_str_flags, binary_bin_flags ) =3D pax.getflags(binary) if executable_only: if os.path.dirname(binary) in shell_path:=09 - sv =3D '%s\n\t%s ( %s )' % ( sv, binary, binary_flags ) - if library_flags !=3D binary_flags: - s =3D '%s\n\t%s ( %s )' % ( s, binary, binary_flags ) + sv =3D '%s\n\t%s ( %s )' % ( sv, binary, binary_str_flags ) + if library_str_flags !=3D binary_str_flags: + s =3D '%s\n\t%s ( %s )' % ( s, binary, binary_str_flags ) count =3D count + 1 else: - sv =3D '%s\n\t%s ( %s )' % ( sv, binary, binary_flags ) - if library_flags !=3D binary_flags: - s =3D '%s\n\t%s ( %s )' % ( s, binary, binary_flags ) + sv =3D '%s\n\t%s ( %s )' % ( sv, binary, binary_str_flags ) + if library_str_flags !=3D binary_str_flags: + s =3D '%s\n\t%s ( %s )' % ( s, binary, binary_str_flags ) count =3D count + 1 except: missing_links.append(binary) @@ -205,21 +205,21 @@ def migrate_flags(elf, pax_flags) =20 def run_binary(binary, verbose, mark): ( linkings, mappings ) =3D get_ldd_linkings(binary) - ( binary_flags, binary_pax_flags ) =3D pax.getflags(binary) - print '%s (%s)\n' % ( binary, binary_flags ) + ( binary_str_flags, binary_bin_flags ) =3D pax.getflags(binary) + print '%s (%s)\n' % ( binary, binary_str_flags ) =20 mismatched_libraries =3D [] =20 for soname in linkings: try: library =3D mappings[soname] - ( library_flags, library_pax_flags ) =3D pax.getflags(library) + ( library_str_flags, library_bin_flags ) =3D pax.getflags(library) if verbose: - print '\t%s\t%s ( %s )' % ( soname, library, library_flags ) - if binary_flags !=3D library_flags: + print '\t%s\t%s ( %s )' % ( soname, library, library_str_flags ) + if binary_str_flags !=3D library_str_flags: mismatched_libraries.append(library) if not verbose: - print '\t%s\t%s ( %s )' % ( soname, library, library_flags ) + print '\t%s\t%s ( %s )' % ( soname, library, library_str_flags ) except: print 'file for soname %s not found' % soname =20 @@ -229,7 +229,7 @@ def run_binary(binary, verbose, mark): else: print if mark: - print '\tWill mark libraries with %s' % binary_flags + print '\tWill mark libraries with %s' % binary_str_flags print for library in mismatched_libraries: do_marking =3D False @@ -246,12 +246,12 @@ def run_binary(binary, verbose, mark): =20 if do_marking: try: - migrate_flags(library, binary_pax_flags) + migrate_flags(library, binary_bin_flags) except: print "\n\tCould not set pax flags on %s, file is probably busy" %= library print "\tShut down all processes that use it and try again" - ( library_flags, library_pax_flags ) =3D pax.getflags(library) - print '\n\t\t%s ( %s )\n' % ( library, library_flags ) + ( library_str_flags, library_bin_flags ) =3D pax.getflags(library) + print '\n\t\t%s ( %s )\n' % ( library, library_str_flags ) =20 =20 def invert_so2library_mappings( so2library_mappings ): @@ -276,29 +276,29 @@ def run_soname(name, verbose, use_soname, mark, exe= cutable_only): linkings =3D reverse_linkings[soname] library =3D so2library_mappings[soname] =20 - ( library_flags, library_pax_flags ) =3D pax.getflags(library) - print '%s\t%s (%s)\n' % ( soname, library, library_flags ) + ( library_str_flags, library_bin_flags ) =3D pax.getflags(library) + print '%s\t%s (%s)\n' % ( soname, library, library_str_flags ) =20 mismatched_binaries =3D [] for binary in linkings: try: - ( binary_flags, binary_pax_flags ) =3D pax.getflags(binary) + ( binary_str_flags, binary_bin_flags ) =3D pax.getflags(binary) if verbose: if executable_only: if os.path.dirname(binary) in shell_path:=09 - print '\t%s ( %s )' % ( binary, binary_flags ) + print '\t%s ( %s )' % ( binary, binary_str_flags ) else: - print '\t%s ( %s )' % ( binary, binary_flags ) - if library_flags !=3D binary_flags: + print '\t%s ( %s )' % ( binary, binary_str_flags ) + if library_str_flags !=3D binary_str_flags: if executable_only: if os.path.dirname(binary) in shell_path:=09 mismatched_binaries.append(binary) if not verbose: - print '\t%s ( %s )' % ( binary, binary_flags ) + print '\t%s ( %s )' % ( binary, binary_str_flags ) else: mismatched_binaries.append(binary) if not verbose: - print '\t%s ( %s )' % ( binary, binary_flags ) + print '\t%s ( %s )' % ( binary, binary_str_flags ) except: print 'cannot obtain pax flags for %s' % binary =20 @@ -308,7 +308,7 @@ def run_soname(name, verbose, use_soname, mark, execu= table_only): else: print if mark: - print '\tWill mark binaries with %s\n' % library_flags + print '\tWill mark binaries with %s\n' % library_str_flags for binary in mismatched_binaries: if executable_only: if not os.path.dirname(binary) in shell_path: @@ -326,12 +326,12 @@ def run_soname(name, verbose, use_soname, mark, exe= cutable_only): print '\t\tPlease enter y or n' if do_marking: try: - migrate_flags(binary, library_pax_flags) + migrate_flags(binary, library_bin_flags) except: print "\n\tCould not set pax flags on %s, file is probably busy" %= binary print "\tShut down all processes that use it and try again" - ( binary_flags, binary_pax_flags ) =3D pax.getflags(binary) - print '\n\t\t%s ( %s )\n' % ( binary, binary_flags ) + ( binary_str_flags, binary_bin_flags ) =3D pax.getflags(binary) + print '\n\t\t%s ( %s )\n' % ( binary, binary_str_flags ) =20 =20 def run_usage():