diff options
author | Lars Wirzenius <liw@liw.fi> | 2013-08-08 18:08:30 +0100 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2013-08-08 18:08:30 +0100 |
commit | 20957edda34cfca6b8aa941305e3f522b0cfde49 (patch) | |
tree | 1915fbf15f77aa27016e20e0cd20b17be1d5787f | |
parent | a61a17ce48fa0ea6bd7199d62c861db946e06cd4 (diff) | |
parent | 5bae2ddc9f20143d2a062b2d342b7a3f8ca1e0a4 (diff) | |
download | cliapp-20957edda34cfca6b8aa941305e3f522b0cfde49.tar.gz |
Sync with upstream branch
-rw-r--r-- | NEWS | 2 | ||||
-rw-r--r-- | cliapp/runcmd.py | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -7,6 +7,8 @@ Version 1.UNRELEASED * Bug fix to cliapp.runcmd pipeline handling: the pipeline now returns failure if any of the processes fails, rather than only the last one. Found and reported by Richard Maw. +* Fix a problem in the pipeline code in runcmd. Reported and fix provided + by Richard Maw. Version 1.20130613 ------------------ diff --git a/cliapp/runcmd.py b/cliapp/runcmd.py index d47fc87..6304a48 100644 --- a/cliapp/runcmd.py +++ b/cliapp/runcmd.py @@ -115,7 +115,7 @@ def _build_pipeline(argvs, pipe_stdin, pipe_stdout, pipe_stderr, kwargs): stdin = pipe_stdin stdout = subprocess.PIPE stderr = pipe_stderr - elif i == len(argv) - 1: + elif i == len(argvs) - 1: stdin = procs[-1].stdout stdout = pipe_stdout stderr = pipe_stderr |