almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Return the output from failed commands in CalledProcessError

Browse Source 
Some callers expect CalledProcessError.output to have the output, so
pass up the stdout + stderr output.

This means failed runcmd template commands will log to program.log and
lorax.log

(cherry picked from commit 522ec34360)
This commit is contained in:
Brian C. Lane 2015-08-04 10:50:37 -07:00
parent 4ffcd47874
commit 0c2905d2a3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pylorax/executils.py
View File

@ -195,7 +195,8 @@ def _run_program(argv, root='/', stdin=None, stdout=None, env_prune=None, log_ou
program_log.debug("Return code: %d", proc.returncode) program_log.debug("Return code: %d", proc.returncode)
if proc.returncode and raise_err: if proc.returncode and raise_err:
raise subprocess.CalledProcessError(proc.returncode, argv) output = output_string or "" + err_string or ""
raise subprocess.CalledProcessError(proc.returncode, argv, output)
return (proc.returncode, output_string) return (proc.returncode, output_string)