From ec513eae49ad3a13c6758ee8664fc6dd9ee84b33 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 6 Apr 2011 20:51:17 +0200 Subject: [PATCH] ++__cdist_echo Signed-off-by: Nico Schottelius --- bin/cdist-manifest-run-init | 2 +- bin/cdist-mass-deploy | 2 +- bin/cdist-object-explorer-run | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/cdist-manifest-run-init b/bin/cdist-manifest-run-init index 9f10c12c..da7af6ba 100755 --- a/bin/cdist-manifest-run-init +++ b/bin/cdist-manifest-run-init @@ -30,5 +30,5 @@ __cdist_target_host="$1"; shift eval export $__cdist_name_var_manifest=\"\$__cdist_manifest_dir\" -echo "Running initial manifest for $__cdist_target_host ..." +__cdist_echo info "Running initial manifest for $__cdist_target_host ..." cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest_init" diff --git a/bin/cdist-mass-deploy b/bin/cdist-mass-deploy index 2753bcab..fae9e633 100755 --- a/bin/cdist-mass-deploy +++ b/bin/cdist-mass-deploy @@ -42,6 +42,6 @@ done # else wait after all are started if [ "$parallel" ]; then - echo "Waiting for cdist-deploy-to jobs to finish..." + __cdist_echo info "Waiting for cdist-deploy-to jobs to finish..." wait fi diff --git a/bin/cdist-object-explorer-run b/bin/cdist-object-explorer-run index 49480bfd..1e0fc36f 100755 --- a/bin/cdist-object-explorer-run +++ b/bin/cdist-object-explorer-run @@ -31,6 +31,7 @@ __cdist_object="$1"; shift __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object")" __cdist_type="$(__cdist_type_from_object "$__cdist_object")" +__cdist_object_self="$__cdist_type/$__cdist_object_id" # Check if type of object has >= 1 explorer __cdist_has_explorer="$(__cdist_type_has_explorer "$__cdist_type")"