ungleich-public/cdist
ungleich-public
/
cdist
7
3
Fork 10
Code Issues 57 Pull Requests 12 Projects Releases Wiki Activity

Better format command error output.

This commit is contained in:
Darko Poljak 2017-09-20 21:19:19 +02:00
parent 0c4826ee97
commit ea58cbd171
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cdist/exec/util.py
View File

@ -133,10 +133,16 @@ def handle_called_process_error(err, command):
# "stdout: {}\n"
# "stderr: {}").format(
# err.returncode, err.output, errout))
raise cdist.Error("Command failed: " + " ".join(command) +
(" with returncode: {}\n"
"stdout: {}").format(
err.returncode, err.output))
if err.output:
output = err.output + '\n'
else:
output = ''
raise cdist.Error(("Command failed: '{}'\n"
"return code: {}\n"
"---- BEGIN stdout ----\n"
"{}"
"---- END stdout ----").format(
" ".join(command), err.returncode, output))
def _call_get_stdout(command, env=None, stderr=None):