From 813b4e1f2be440b960c90c28e7bf62c7c8cc4ca7 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Wed, 6 Apr 2011 20:11:39 +0200
Subject: [PATCH] use __cdist_exec_fail_on_error in bin/cdist-code-run

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 bin/cdist-code-run        |  2 +-
 bin/cdist-config          | 12 ++++++++----
 bin/cdist-object-code-run |  6 ++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/bin/cdist-code-run b/bin/cdist-code-run
index 54cb312f..cf7e8e8d 100755
--- a/bin/cdist-code-run
+++ b/bin/cdist-code-run
@@ -40,7 +40,7 @@ if [ -e "$code" ]; then
    if [ -f "$code" ]; then
       if [ -x "$code" ]; then
          echo "Executing code-${__cdist_gencode_type}  for $__cdist_object ..."
-         "$code"
+         __cdist_exec_fail_on_error "$code"
       else
          __cdist_exit_err "$code exists, but is not executable."
       fi
diff --git a/bin/cdist-config b/bin/cdist-config
index b5e1fe10..8678d205 100755
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -152,20 +152,24 @@ __cdist_echo()
 {
    __cdist_echo_type="$1"; shift
 
+   if [ "$__cdist_object_self" ]; then
+      __cdist_echo_prefix="$__cdist_object_self"
+   fi
+
    case "$__cdist_echo_type" in
       debug)
          if [ "$__cdist_debug" ]; then
-            echo "Debug: $@"
+            echo $__cdist_echo_prefix "Debug: $@"
          fi
       ;;
       info)
-         echo "$@"
+         echo $__cdist_echo_prefix "$@"
       ;;
       warning)
-         echo "Warning: $@"
+         echo $__cdist_echo_prefix "Warning: $@"
       ;;
       error)
-         echo "Error: $@" >&2
+         echo $__cdist_echo_prefix "Error: $@" >&2
       ;;
    esac
 }
diff --git a/bin/cdist-object-code-run b/bin/cdist-object-code-run
index 97cb58ac..fa63aaba 100755
--- a/bin/cdist-object-code-run
+++ b/bin/cdist-object-code-run
@@ -31,10 +31,8 @@ __cdist_object="$1"; shift
 
 # Code local
 export __cdist_out_object_dir="$__cdist_out_object_dir"
-cdist-code-run "$__cdist_object" "${__cdist_name_gencode_local}" \
-   || __cdist_exit_err "Local code failed for $__cdist_object"
+cdist-code-run "$__cdist_object" "${__cdist_name_gencode_local}"
 
 # Code remote
 cdist-run-remote "$__cdist_target_host" \
-   "cdist-code-run" "$__cdist_object" "${__cdist_name_gencode_remote}" \
-   || __cdist_exit_err "Remote code failed for $__cdist_object"
+   "cdist-code-run" "$__cdist_object" "${__cdist_name_gencode_remote}"