summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Keen <keenerd@gmail.com>2016-08-18 12:04:48 -0400
committerKyle Keen <keenerd@gmail.com>2016-08-18 12:04:48 -0400
commit2090aa73950508eb7134845adfbc9a2b9bf2c419 (patch)
tree20b644aca5449966cbb1930c9b42c00744e7bf80
parent99bf6961a01a75c976362983052dce14bab6cfa5 (diff)
downloadnamcap-2090aa73950508eb7134845adfbc9a2b9bf2c419.tar.gz
namcap-2090aa73950508eb7134845adfbc9a2b9bf2c419.zip
Fix API changes in pyelftools 0.24 (FS#50428)
Signed-off-by: Kyle Keen <keenerd@gmail.com>
-rw-r--r--Namcap/rules/rpath.py2
-rw-r--r--Namcap/rules/sodepends.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Namcap/rules/rpath.py b/Namcap/rules/rpath.py
index 51b2a15..4da040c 100644
--- a/Namcap/rules/rpath.py
+++ b/Namcap/rules/rpath.py
@@ -35,7 +35,7 @@ def get_rpaths(fileobj):
for tag in section.iter_tags():
if tag.entry.d_tag != 'DT_RPATH':
continue
- rpaths = tag.rpath.decode('ascii')
+ rpaths = tag.rpath
rpaths = rpaths.split(':')
for path in rpaths:
yield path
diff --git a/Namcap/rules/sodepends.py b/Namcap/rules/sodepends.py
index eb3ef86..bce3a40 100644
--- a/Namcap/rules/sodepends.py
+++ b/Namcap/rules/sodepends.py
@@ -59,7 +59,7 @@ def scanlibs(fileobj, filename, custom_libs):
continue
bitsize = elffile.elfclass
architecture = {32:'i686', 64:'x86-64'}[bitsize]
- libname = tag.needed.decode('utf-8')
+ libname = tag.needed
if libname in custom_libs:
sharedlibs[custom_libs[libname][1:]].add(filename)
continue