Skip to content

Python 3 fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarneaud wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Python 3 fixes #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions dockerize/depsolver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ def read_sections(self):
def section(self, name):
'''Return the raw content of the named section from the ELF file.'''
section = self[name]
with open(self.path) as fde:
with open(self.path, 'rb') as fde:
fde.seek(int(section.offset, base=16))
data = fde.read(int(section.size, base=16))
return data
return data.decode('utf-8')

def interpreter(self):
'''Return the value of the `.interp` section of the ELF file.'''
Expand All @@ -80,18 +80,20 @@ def get_deps(self, path):
# to produce the list of library dependencies.
try:
elf = ELFFile(path)
interp = elf.interpreter()
except ValueError:
LOG.debug('%s is not a dynamically linked ELF binary (ignoring)',
path)
return

try:
interp = elf.interpreter()
except KeyError:
LOG.debug('%s does not have a .interp section',
path)
return

self.deps.add(interp)
out = subprocess.check_output([interp, '--list', path])
out = subprocess.check_output([interp, '--list', path]).decode('utf-8')

for line in out.splitlines():
for exp in RE_DEPS:
Expand Down