diff options
-rwxr-xr-x | repo | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -382,7 +382,16 @@ def run_command(cmd, **kwargs): | |||
382 | # Run & package the results. | 382 | # Run & package the results. |
383 | proc = subprocess.Popen(cmd, **kwargs) | 383 | proc = subprocess.Popen(cmd, **kwargs) |
384 | (stdout, stderr) = proc.communicate(input=cmd_input) | 384 | (stdout, stderr) = proc.communicate(input=cmd_input) |
385 | trace.print(':', ' '.join(cmd)) | 385 | dbg = ': ' + ' '.join(cmd) |
386 | if cmd_input is not None: | ||
387 | dbg += ' 0<|' | ||
388 | if stdout == subprocess.PIPE: | ||
389 | dbg += ' 1>|' | ||
390 | if stderr == subprocess.PIPE: | ||
391 | dbg += ' 2>|' | ||
392 | elif stderr == subprocess.STDOUT: | ||
393 | dbg += ' 2>&1' | ||
394 | trace.print(dbg) | ||
386 | ret = RunResult(proc.returncode, decode(stdout), decode(stderr)) | 395 | ret = RunResult(proc.returncode, decode(stdout), decode(stderr)) |
387 | 396 | ||
388 | # If things failed, print useful debugging output. | 397 | # If things failed, print useful debugging output. |