| 1 |
commit: e68a8d9fe0ac6788695bf779180db1ed790f6cb7 |
| 2 |
Author: Matthew Thode <mthode <AT> mthode <DOT> org> |
| 3 |
AuthorDate: Mon Jan 20 17:01:27 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 23 16:22:45 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=e68a8d9f |
| 7 |
|
| 8 |
fix used before define on sv/s |
| 9 |
|
| 10 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
scripts/revdep-pax | 18 ++++++++++++------ |
| 14 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/scripts/revdep-pax b/scripts/revdep-pax |
| 17 |
index ebdea9c..2d9de16 100755 |
| 18 |
--- a/scripts/revdep-pax |
| 19 |
+++ b/scripts/revdep-pax |
| 20 |
@@ -240,11 +240,13 @@ def run_forward(verbose): |
| 21 |
try: |
| 22 |
(elf_str_flags, elf_bin_flags) = pax.getflags(elf) |
| 23 |
sv = '%s :%s ( %s )' % (elf, abi, elf_str_flags) |
| 24 |
- s = sv |
| 25 |
- except pax.PaxError: |
| 26 |
- sv = '%s :%s ( %s )' % (elf, abi, '****') |
| 27 |
- s = sv |
| 28 |
+ except (pax.PaxError, RuntimeError, TypeError, NameError): |
| 29 |
+ #because this is a pax error (likely), we need to set elf_str_flags |
| 30 |
+ #elf_str_flags and sv are used a few lines down |
| 31 |
+ elf_str_flags = '****' |
| 32 |
+ sv = '%s :%s ( %s )' % (elf, abi, elf_str_flags) |
| 33 |
continue |
| 34 |
+ s = sv |
| 35 |
|
| 36 |
count = 0 |
| 37 |
for soname in object_linkings[abi][elf]: |
| 38 |
@@ -291,10 +293,14 @@ def run_reverse(verbose, executable_only): |
| 39 |
(library_str_flags, library_bin_flags) = pax.getflags(library) |
| 40 |
except pax.PaxError: |
| 41 |
library_str_flags = '****' |
| 42 |
- sv = '%s\t%s :%s ( %s )' % (soname, library, abi, library_str_flags) |
| 43 |
- s = sv |
| 44 |
except KeyError: |
| 45 |
sonames_missing_library.append(soname) |
| 46 |
+ library = 'unknown_library' |
| 47 |
+ library_str_flags = '****' |
| 48 |
+ #always gets set, and dependant variables always get set, no need to |
| 49 |
+ #be in a try statement |
| 50 |
+ sv = '%s\t%s :%s ( %s )' % (soname, library, abi, library_str_flags) |
| 51 |
+ s = sv |
| 52 |
|
| 53 |
count = 0 |
| 54 |
for elf in object_reverse_linkings[abi][soname]: |
Archives