summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2017-01-26 21:58:39 +0200
committerLars Wirzenius <liw@liw.fi>2017-01-26 21:58:39 +0200
commit62c1c12fc3d720cf15bfcf0c762d55dd585f48c7 (patch)
treeb65a2390999e4b50c5ccb9307f0065daa2f92de0
parent0e03de07ff197e7bfb06cd6cc7daef7e4bc96681 (diff)
downloadcliapp-62c1c12fc3d720cf15bfcf0c762d55dd585f48c7.tar.gz
Avoid timeouts if there actually is output
-rw-r--r--cliapp/runcmd.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/cliapp/runcmd.py b/cliapp/runcmd.py
index 32fb0e0..de6ecc2 100644
--- a/cliapp/runcmd.py
+++ b/cliapp/runcmd.py
@@ -242,6 +242,7 @@ def _run_pipeline(procs, feed_stdin, pipe_stdin, pipe_stdout, pipe_stderr,
out.append(data_new)
else:
stdout_eof = True
+ timeout = False
if procs[-1].stderr in r:
data = procs[-1].stderr.read(io_size)
@@ -252,6 +253,7 @@ def _run_pipeline(procs, feed_stdin, pipe_stdin, pipe_stdout, pipe_stderr,
err.append(data_new)
else:
stderr_eof = True
+ timeout = False
while not timeout and still_running():
for p in procs: