From b76c4a5105d21cc76caa9d4ecf3980e1afe6bfc5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 14 Sep 2011 08:45:55 +0200 Subject: [PATCH] make shell exec error and normal error look the same for easier grepping in logfiles Signed-off-by: Nico Schottelius --- bin/cdist | 2 +- doc/dev/benchmark-parallel-deploy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/cdist b/bin/cdist index 92161908..f7ad2f72 100755 --- a/bin/cdist +++ b/bin/cdist @@ -197,7 +197,7 @@ class Cdist: print(script_fd.read()) script_fd.close() - self.exit_error("Non-Zero exit code exit of " + " ".join(*args)) + self.exit_error("Command failed (shell): " + " ".join(*args)) def run_or_fail(self, *args, **kargs): if "remote" in kargs: diff --git a/doc/dev/benchmark-parallel-deploy b/doc/dev/benchmark-parallel-deploy index 82d2240c..0e7c4a2f 100755 --- a/doc/dev/benchmark-parallel-deploy +++ b/doc/dev/benchmark-parallel-deploy @@ -5,7 +5,7 @@ outfile="$1"; shift ( for host in "$@"; do hosts="$hosts $host" - cdist config -c ~/p/cdist-nutzung -p $hosts + cdist config -c ~/p/cdist-nutzung -p $hosts 2>&1 done ) | tee "$outfile" echo "----------"