Compare commits

...
4 Commits
Author SHA1 Message Date
Zach Riggle 74f475170d Bump version to 3.12.2 2019-01-07 15:21:39 -06:00
Kyle Zeng 0dc0a9acc0 check qemu_path correctly and give out a reasonable error msg (#1243) 2019-01-07 14:42:24 -06:00
Zach Riggle 774ed3b85e Do not use intervaltree 3.xx (#1242)
In the future, we may want to update Pwntools to use the newer version.

In the meantime, pin to 2.xx
2018-12-28 23:19:54 -06:00
joesixpack666 292b81af17 close ssh_channel properly in download() (#1208) (#1209)
* close ssh_channel properly in download() (#1208)

* Update ssh.py
2018-10-17 13:14:20 -05:00
4 changed files with 9 additions and 7 deletions

No files matched your search

+2 -2
View File
@@ -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
View File
@@ -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
View File
@@ -1 +1 @@
__version__ = '3.12.1'
__version__ = '3.12.2'
+2 -2
View File
@@ -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')),
],