From 5359ed863cde6f920e0e59ec474e8a3ddbe9dfc6 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 31 Mar 2011 20:21:08 +0200 Subject: [PATCH] +cleanups++ Signed-off-by: Nico Schottelius --- bin/cdist-object-manifest-run | 2 +- bin/cdist-object-process | 2 +- doc/dev/todo/TAKEME | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/cdist-object-manifest-run b/bin/cdist-object-manifest-run index 25378eb2..74a81469 100755 --- a/bin/cdist-object-manifest-run +++ b/bin/cdist-object-manifest-run @@ -46,12 +46,12 @@ if [ -f "$__cdist_manifest" ]; then export __cdist_manifest echo "Executing manifest ${__cdist_manifest} ..." - # Make variables available to non-core - FIXME: beatify export $__cdist_name_var_object="$__cdist_cur_object_dir" export $__cdist_name_var_object_id="$__cdist_object_id" export $__cdist_name_var_type="$(__cdist_type_dir "$__cdist_type")" cdist-manifest-run "$__cdist_target_host" "$__cdist_manifest" + # Tell cdist-object-run-all that there may be new objects touch "$__cdist_objects_created" else diff --git a/bin/cdist-object-process b/bin/cdist-object-process index d10840e8..777d2c88 100755 --- a/bin/cdist-object-process +++ b/bin/cdist-object-process @@ -31,7 +31,7 @@ set -eu __cdist_target_host="$1"; shift __cdist_object="$1"; shift __cdist_object_dir="$(__cdist_object_dir "$__cdist_object")" -[ -d "$__cdist_object_dir" ] || __cdist_exit_err "Requested object is not defined: $__cdist_object" +[ -d "$__cdist_object_dir" ] || __cdist_exit_err "Object undefined: $__cdist_object" # Export to non-core for use in manifest and gencode scripts export $__cdist_name_var_self=$__cdist_object diff --git a/doc/dev/todo/TAKEME b/doc/dev/todo/TAKEME index 4dc5b53b..03c4f244 100644 --- a/doc/dev/todo/TAKEME +++ b/doc/dev/todo/TAKEME @@ -16,6 +16,7 @@ CORE - cdist-object-gencode: remove code if output empty? - also take care of that in cdist-code-run! +- cdist-object-process -> cdist-object-prepare TYPES ------