Fix \n thing.

2017-09-20 21:53:05 +02:00 · 2017-09-20 21:53:05 +02:00 · 966bf30bee
commit 966bf30bee
parent ea58cbd171
1 changed files with 2 additions and 2 deletions
--- a/cdist/exec/util.py
+++ b/cdist/exec/util.py
@ -134,13 +134,13 @@ def handle_called_process_error(err, command):
    #                    "stderr: {}").format(
    #                       err.returncode, err.output, errout))
    if err.output:
-        output = err.output + '\n'
+        output = err.output
    else:
        output = ''
    raise cdist.Error(("Command failed: '{}'\n"
                      "return code: {}\n"
                       "---- BEGIN stdout ----\n"
-                       "{}"
+                       "{}" + ("\n" if output else "") +
                       "---- END stdout ----").format(
                          " ".join(command), err.returncode, output))