From 3c3dad18429f194804fca820b86d9e8ac99c9424 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 16 Feb 2011 20:14:40 +0100 Subject: [PATCH] rename __cdist_name_object_finished as well Signed-off-by: Nico Schottelius --- bin/cdist-config | 10 ++++++---- bin/cdist-manifest-recursive-run | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/bin/cdist-config b/bin/cdist-config index ec2a22f1..4b85d042 100755 --- a/bin/cdist-config +++ b/bin/cdist-config @@ -36,10 +36,15 @@ : ${__cdist_name_manifest:=manifests} : ${__cdist_name_object:=objects} : ${__cdist_name_type:=types} + +# Name of the executable generated : ${__cdist_name_exec:=exec} # File that contains source of a specific object creation -: ${__cdist_name_object_source=.source} +: ${__cdist_name_object_source:=.source} + +# Marks an object finished +: ${__cdist_name_object_finished:=.done} # Base @@ -85,9 +90,6 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname" # Used for IDs __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*' -# Mark object finished -__cdist_object_finished=".done" - ################################################################################ # Function list diff --git a/bin/cdist-manifest-recursive-run b/bin/cdist-manifest-recursive-run index 99d86aec..8bd95063 100755 --- a/bin/cdist-manifest-recursive-run +++ b/bin/cdist-manifest-recursive-run @@ -60,7 +60,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do cat "$__cdist_tmp_file" while read object; do - if [ ! -f "${object}/$__cdist_object_finished" ]; then + if [ ! -f "${object}/$___cdist_name_object_finished" ]; then echo "Working on object ${object} ..." type=${object%%/*} @@ -86,7 +86,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do __cdist_exit_err "${newobject} already exists, merge failed." else # Fine, merge back! FIXME: touch correct here? - touch "${newobject}/$__cdist_object_finished" + touch "${newobject}/$___cdist_name_object_finished" pax -r -w "$newobject" "$__cdist_object_dir" fi done < "$__cdist_tmp_file"