mirror of
https://github.com/Gallopsled/pwntools.git
synced 2026-11-09 10:09:36 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
74f475170d | ||
|
|
0dc0a9acc0 | ||
|
|
774ed3b85e | ||
|
|
292b81af17 |
No files matched your search
@@ -434,11 +434,11 @@ class process(tube):
|
||||
# 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]
|
||||
|
||||
+4
-2
@@ -1619,7 +1619,6 @@ from ctypes import *; libc = CDLL('libc.so.6'); print(libc.getenv(%r))
|
||||
|
||||
self.error('%r does not exist' % file_or_directory)
|
||||
|
||||
|
||||
def download(self, file_or_directory, local=None):
|
||||
"""download(file_or_directory, local=None)
|
||||
|
||||
@@ -1633,7 +1632,10 @@ from ctypes import *; libc = CDLL('libc.so.6'); print(libc.getenv(%r))
|
||||
if not self.sftp:
|
||||
self.error("Cannot determine remote file type without SFTP")
|
||||
|
||||
if 0 == self.system('test -d ' + sh_string(file_or_directory)).wait():
|
||||
with self.system('test -d ' + sh_string(file_or_directory)) as io:
|
||||
is_dir = io.wait()
|
||||
|
||||
if 0 == is_dir:
|
||||
self.download_dir(file_or_directory, local)
|
||||
else:
|
||||
self.download_file(file_or_directory, local)
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
__version__ = '3.12.1'
|
||||
__version__ = '3.12.2'
|
||||
@@ -57,7 +57,7 @@ install_requires = ['paramiko>=1.15.2',
|
||||
'pypandoc',
|
||||
'packaging',
|
||||
'psutil>=3.3.0',
|
||||
'intervaltree',
|
||||
'intervaltree<3.0', # See Gallopsled/pwntools#1238
|
||||
'sortedcontainers<2.0', # See Gallopsled/pwntools#1154
|
||||
'unicorn']
|
||||
|
||||
@@ -87,7 +87,7 @@ except Exception as e:
|
||||
setup(
|
||||
name = 'pwntools',
|
||||
packages = find_packages(),
|
||||
version = '3.12.1',
|
||||
version = '3.12.2',
|
||||
data_files = [('',
|
||||
glob.glob('*.md') + glob.glob('*.txt')),
|
||||
],
|
||||
|
||||
Reference in new issue
Block a user