From ff2d5629d65a3bafe90df40718fd6ab393055527 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 8 Sep 2011 03:28:06 +0200 Subject: [PATCH] submit string on failed error Signed-off-by: Nico Schottelius --- bin/cdist | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/bin/cdist b/bin/cdist index 339349a3..ab913541 100755 --- a/bin/cdist +++ b/bin/cdist @@ -30,7 +30,7 @@ def logger(type, *args): print(*args) def exit_error(*args): - logger("error", args) + logger("error", *args) sys.exit(1) @@ -42,8 +42,8 @@ def run_or_fail(*args): try: subprocess.check_call(newargs) - except CalledProcessError: - exit_error("Command failed:", newargs) + except subprocess.CalledProcessError: + exit_error("Command failed:", " ".join(newargs)) def remote_run_or_fail(hostname, *args): """Run something on the remote side and fail is something breaks""" @@ -104,8 +104,6 @@ def global_explore(hostname): for explorer in explorers: remote_run_or_fail(hostname, [remote_global_explorer_path(explorer)]) - remote_run_or_fail(hostname, [remote_global_explorer_path("moo")]) - def init_deploy(hostname): logger("info", "Creating clean directory structure")