| 1 |
commit: 362985814ed4b365e7e74a0a6f3178ce95c9f616 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 28 15:31:22 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 28 15:31:22 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=36298581 |
| 7 |
|
| 8 |
scripts/revdep-pax: cleaned up namespace |
| 9 |
|
| 10 |
--- |
| 11 |
scripts/revdep-pax | 74 ++++++++++++++++++++++++++-------------------------- |
| 12 |
1 files changed, 37 insertions(+), 37 deletions(-) |
| 13 |
|
| 14 |
diff --git a/scripts/revdep-pax b/scripts/revdep-pax |
| 15 |
index a4e9396..de1fb66 100755 |
| 16 |
--- a/scripts/revdep-pax |
| 17 |
+++ b/scripts/revdep-pax |
| 18 |
@@ -82,8 +82,8 @@ def print_forward_linkings( forward_linkings, so2library_mappings, verbose ): |
| 19 |
for binary in forward_linkings: |
| 20 |
|
| 21 |
try: |
| 22 |
- ( binary_flags, binary_pax_flags ) = pax.getflags(binary) |
| 23 |
- sv = '%s ( %s )\n' % ( binary, binary_flags ) |
| 24 |
+ ( binary_str_flags, binary_bin_flags ) = pax.getflags(binary) |
| 25 |
+ sv = '%s ( %s )\n' % ( binary, binary_str_flags ) |
| 26 |
s = sv |
| 27 |
except: |
| 28 |
missing_binaries.append(binary) |
| 29 |
@@ -93,10 +93,10 @@ def print_forward_linkings( forward_linkings, so2library_mappings, verbose ): |
| 30 |
for soname in forward_linkings[binary]: |
| 31 |
try: |
| 32 |
library = so2library_mappings[soname] |
| 33 |
- ( library_flags, library_pax_flags ) = pax.getflags(library) |
| 34 |
- sv = '%s\n\t%s\t%s ( %s )' % ( sv, soname, library, library_flags ) |
| 35 |
- if binary_flags != library_flags: |
| 36 |
- s = '%s\n\t%s\t%s ( %s )' % ( s, soname, library, library_flags ) |
| 37 |
+ ( library_str_flags, library_bin_flags ) = pax.getflags(library) |
| 38 |
+ sv = '%s\n\t%s\t%s ( %s )' % ( sv, soname, library, library_str_flags ) |
| 39 |
+ if binary_str_flags != library_str_flags: |
| 40 |
+ s = '%s\n\t%s\t%s ( %s )' % ( s, soname, library, library_str_flags ) |
| 41 |
count = count + 1 |
| 42 |
except: |
| 43 |
missing_links.append(soname) |
| 44 |
@@ -130,8 +130,8 @@ def print_reverse_linkings( reverse_linkings, so2library_mappings, verbose, exec |
| 45 |
for soname in reverse_linkings: |
| 46 |
try: |
| 47 |
library = so2library_mappings[soname] |
| 48 |
- ( library_flags, library_pax_flags ) = pax.getflags(library) |
| 49 |
- sv = '%s\t%s ( %s )\n' % ( soname, library, library_flags ) |
| 50 |
+ ( library_str_flags, library_bin_flags ) = pax.getflags(library) |
| 51 |
+ sv = '%s\t%s ( %s )\n' % ( soname, library, library_str_flags ) |
| 52 |
s = sv |
| 53 |
except: |
| 54 |
missing_sonames.append(soname) |
| 55 |
@@ -140,17 +140,17 @@ def print_reverse_linkings( reverse_linkings, so2library_mappings, verbose, exec |
| 56 |
count = 0 |
| 57 |
for binary in reverse_linkings[soname]: |
| 58 |
try: |
| 59 |
- ( binary_flags, binary_pax_flags ) = pax.getflags(binary) |
| 60 |
+ ( binary_str_flags, binary_bin_flags ) = pax.getflags(binary) |
| 61 |
if executable_only: |
| 62 |
if os.path.dirname(binary) in shell_path: |
| 63 |
- sv = '%s\n\t%s ( %s )' % ( sv, binary, binary_flags ) |
| 64 |
- if library_flags != binary_flags: |
| 65 |
- s = '%s\n\t%s ( %s )' % ( s, binary, binary_flags ) |
| 66 |
+ sv = '%s\n\t%s ( %s )' % ( sv, binary, binary_str_flags ) |
| 67 |
+ if library_str_flags != binary_str_flags: |
| 68 |
+ s = '%s\n\t%s ( %s )' % ( s, binary, binary_str_flags ) |
| 69 |
count = count + 1 |
| 70 |
else: |
| 71 |
- sv = '%s\n\t%s ( %s )' % ( sv, binary, binary_flags ) |
| 72 |
- if library_flags != binary_flags: |
| 73 |
- s = '%s\n\t%s ( %s )' % ( s, binary, binary_flags ) |
| 74 |
+ sv = '%s\n\t%s ( %s )' % ( sv, binary, binary_str_flags ) |
| 75 |
+ if library_str_flags != binary_str_flags: |
| 76 |
+ s = '%s\n\t%s ( %s )' % ( s, binary, binary_str_flags ) |
| 77 |
count = count + 1 |
| 78 |
except: |
| 79 |
missing_links.append(binary) |
| 80 |
@@ -205,21 +205,21 @@ def migrate_flags(elf, pax_flags) |
| 81 |
|
| 82 |
def run_binary(binary, verbose, mark): |
| 83 |
( linkings, mappings ) = get_ldd_linkings(binary) |
| 84 |
- ( binary_flags, binary_pax_flags ) = pax.getflags(binary) |
| 85 |
- print '%s (%s)\n' % ( binary, binary_flags ) |
| 86 |
+ ( binary_str_flags, binary_bin_flags ) = pax.getflags(binary) |
| 87 |
+ print '%s (%s)\n' % ( binary, binary_str_flags ) |
| 88 |
|
| 89 |
mismatched_libraries = [] |
| 90 |
|
| 91 |
for soname in linkings: |
| 92 |
try: |
| 93 |
library = mappings[soname] |
| 94 |
- ( library_flags, library_pax_flags ) = pax.getflags(library) |
| 95 |
+ ( library_str_flags, library_bin_flags ) = pax.getflags(library) |
| 96 |
if verbose: |
| 97 |
- print '\t%s\t%s ( %s )' % ( soname, library, library_flags ) |
| 98 |
- if binary_flags != library_flags: |
| 99 |
+ print '\t%s\t%s ( %s )' % ( soname, library, library_str_flags ) |
| 100 |
+ if binary_str_flags != library_str_flags: |
| 101 |
mismatched_libraries.append(library) |
| 102 |
if not verbose: |
| 103 |
- print '\t%s\t%s ( %s )' % ( soname, library, library_flags ) |
| 104 |
+ print '\t%s\t%s ( %s )' % ( soname, library, library_str_flags ) |
| 105 |
except: |
| 106 |
print 'file for soname %s not found' % soname |
| 107 |
|
| 108 |
@@ -229,7 +229,7 @@ def run_binary(binary, verbose, mark): |
| 109 |
else: |
| 110 |
print |
| 111 |
if mark: |
| 112 |
- print '\tWill mark libraries with %s' % binary_flags |
| 113 |
+ print '\tWill mark libraries with %s' % binary_str_flags |
| 114 |
print |
| 115 |
for library in mismatched_libraries: |
| 116 |
do_marking = False |
| 117 |
@@ -246,12 +246,12 @@ def run_binary(binary, verbose, mark): |
| 118 |
|
| 119 |
if do_marking: |
| 120 |
try: |
| 121 |
- migrate_flags(library, binary_pax_flags) |
| 122 |
+ migrate_flags(library, binary_bin_flags) |
| 123 |
except: |
| 124 |
print "\n\tCould not set pax flags on %s, file is probably busy" % library |
| 125 |
print "\tShut down all processes that use it and try again" |
| 126 |
- ( library_flags, library_pax_flags ) = pax.getflags(library) |
| 127 |
- print '\n\t\t%s ( %s )\n' % ( library, library_flags ) |
| 128 |
+ ( library_str_flags, library_bin_flags ) = pax.getflags(library) |
| 129 |
+ print '\n\t\t%s ( %s )\n' % ( library, library_str_flags ) |
| 130 |
|
| 131 |
|
| 132 |
def invert_so2library_mappings( so2library_mappings ): |
| 133 |
@@ -276,29 +276,29 @@ def run_soname(name, verbose, use_soname, mark, executable_only): |
| 134 |
linkings = reverse_linkings[soname] |
| 135 |
library = so2library_mappings[soname] |
| 136 |
|
| 137 |
- ( library_flags, library_pax_flags ) = pax.getflags(library) |
| 138 |
- print '%s\t%s (%s)\n' % ( soname, library, library_flags ) |
| 139 |
+ ( library_str_flags, library_bin_flags ) = pax.getflags(library) |
| 140 |
+ print '%s\t%s (%s)\n' % ( soname, library, library_str_flags ) |
| 141 |
|
| 142 |
mismatched_binaries = [] |
| 143 |
for binary in linkings: |
| 144 |
try: |
| 145 |
- ( binary_flags, binary_pax_flags ) = pax.getflags(binary) |
| 146 |
+ ( binary_str_flags, binary_bin_flags ) = pax.getflags(binary) |
| 147 |
if verbose: |
| 148 |
if executable_only: |
| 149 |
if os.path.dirname(binary) in shell_path: |
| 150 |
- print '\t%s ( %s )' % ( binary, binary_flags ) |
| 151 |
+ print '\t%s ( %s )' % ( binary, binary_str_flags ) |
| 152 |
else: |
| 153 |
- print '\t%s ( %s )' % ( binary, binary_flags ) |
| 154 |
- if library_flags != binary_flags: |
| 155 |
+ print '\t%s ( %s )' % ( binary, binary_str_flags ) |
| 156 |
+ if library_str_flags != binary_str_flags: |
| 157 |
if executable_only: |
| 158 |
if os.path.dirname(binary) in shell_path: |
| 159 |
mismatched_binaries.append(binary) |
| 160 |
if not verbose: |
| 161 |
- print '\t%s ( %s )' % ( binary, binary_flags ) |
| 162 |
+ print '\t%s ( %s )' % ( binary, binary_str_flags ) |
| 163 |
else: |
| 164 |
mismatched_binaries.append(binary) |
| 165 |
if not verbose: |
| 166 |
- print '\t%s ( %s )' % ( binary, binary_flags ) |
| 167 |
+ print '\t%s ( %s )' % ( binary, binary_str_flags ) |
| 168 |
except: |
| 169 |
print 'cannot obtain pax flags for %s' % binary |
| 170 |
|
| 171 |
@@ -308,7 +308,7 @@ def run_soname(name, verbose, use_soname, mark, executable_only): |
| 172 |
else: |
| 173 |
print |
| 174 |
if mark: |
| 175 |
- print '\tWill mark binaries with %s\n' % library_flags |
| 176 |
+ print '\tWill mark binaries with %s\n' % library_str_flags |
| 177 |
for binary in mismatched_binaries: |
| 178 |
if executable_only: |
| 179 |
if not os.path.dirname(binary) in shell_path: |
| 180 |
@@ -326,12 +326,12 @@ def run_soname(name, verbose, use_soname, mark, executable_only): |
| 181 |
print '\t\tPlease enter y or n' |
| 182 |
if do_marking: |
| 183 |
try: |
| 184 |
- migrate_flags(binary, library_pax_flags) |
| 185 |
+ migrate_flags(binary, library_bin_flags) |
| 186 |
except: |
| 187 |
print "\n\tCould not set pax flags on %s, file is probably busy" % binary |
| 188 |
print "\tShut down all processes that use it and try again" |
| 189 |
- ( binary_flags, binary_pax_flags ) = pax.getflags(binary) |
| 190 |
- print '\n\t\t%s ( %s )\n' % ( binary, binary_flags ) |
| 191 |
+ ( binary_str_flags, binary_bin_flags ) = pax.getflags(binary) |
| 192 |
+ print '\n\t\t%s ( %s )\n' % ( binary, binary_str_flags ) |
| 193 |
|
| 194 |
|
| 195 |
def run_usage(): |
Archives