projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 3112-report-bug
[arvados.git]
/
sdk
/
python
/
arvados
/
util.py
diff --git
a/sdk/python/arvados/util.py
b/sdk/python/arvados/util.py
index e063f12de91c6ceb1d76302db6ea1ea201d57174..d5ea18ba49ad749a60aa9faba7141ddb6e3bbf63 100644
(file)
--- a/
sdk/python/arvados/util.py
+++ b/
sdk/python/arvados/util.py
@@
-30,7
+30,10
@@
def run_command(execargs, **kwargs):
kwargs.setdefault('close_fds', True)
kwargs.setdefault('shell', False)
p = subprocess.Popen(execargs, **kwargs)
kwargs.setdefault('close_fds', True)
kwargs.setdefault('shell', False)
p = subprocess.Popen(execargs, **kwargs)
- stdoutdata, stderrdata = p.communicate(None)
+ if kwargs['stdout'] == subprocess.PIPE:
+ stdoutdata, stderrdata = p.communicate(None)
+ else:
+ p.wait()
if p.returncode != 0:
raise errors.CommandFailedError(
"run_command %s exit %d:\n%s" %
if p.returncode != 0:
raise errors.CommandFailedError(
"run_command %s exit %d:\n%s" %
@@
-162,7
+165,7
@@
def zipball_extract(zipball, path):
break
zip_file.write(buf)
zip_file.close()
break
zip_file.write(buf)
zip_file.close()
-
+
p = subprocess.Popen(["unzip",
"-q", "-o",
"-d", path,
p = subprocess.Popen(["unzip",
"-q", "-o",
"-d", path,