Permalink
Browse files

Merge branch 'beta' into dev

  • Loading branch information...
zachriggle committed Jan 7, 2019
2 parents 3123ffe + 5befb2f commit ec00cb3f908e81802896c457b8b4dc2be7a64369
Showing with 3 additions and 3 deletions.
  1. +2 −2 pwnlib/tubes/process.py
  2. +1 −1 setup.py
@@ -435,11 +435,11 @@ def __on_enoexec(self, exception):
# appropriate qemu binary to run it.
qemu_path = qemu.user_path(arch=binary.arch)

if not qemu:
if not qemu_path:
raise exception

qemu_path = which(qemu_path)
if qemu:
if qemu_path:
self._qemu = qemu_path

args = [qemu_path]
@@ -57,7 +57,7 @@
'python-dateutil',
'packaging',
'psutil>=3.3.0',
'intervaltree',
'intervaltree<3.0', # See Gallopsled/pwntools#1238
'sortedcontainers<2.0', # See Gallopsled/pwntools#1154
'unicorn']

0 comments on commit ec00cb3

Please sign in to comment.