matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Fix \n thing.

Browse source
This commit is contained in:
Darko Poljak 2017-09-20 21:53:05 +02:00
parent ea58cbd171
commit 966bf30bee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/exec/util.py
View file

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