thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

rename __cdist_name_object_finished as well

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-16 20:14:40 +01:00
parent 64d71229f8
commit 3c3dad1842
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bin/cdist-config
View file

@ -36,10 +36,15 @@
: ${__cdist_name_manifest:=manifests} : ${__cdist_name_manifest:=manifests}
: ${__cdist_name_object:=objects} : ${__cdist_name_object:=objects}
: ${__cdist_name_type:=types} : ${__cdist_name_type:=types}
# Name of the executable generated
: ${__cdist_name_exec:=exec} : ${__cdist_name_exec:=exec}
# File that contains source of a specific object creation # 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 # Base
@ -85,9 +90,6 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
# Used for IDs # Used for IDs
__cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*' __cdist_sane_regexp='[A-Za-z0-9]*[-A-Za-z0-9_]*'
# Mark object finished
__cdist_object_finished=".done"
################################################################################ ################################################################################
# Function list # Function list

4
bin/cdist-manifest-recursive-run
View file

@ -60,7 +60,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do
cat "$__cdist_tmp_file" cat "$__cdist_tmp_file"
while read object; do while read object; do
if [ ! -f "${object}/$__cdist_object_finished" ]; then if [ ! -f "${object}/$___cdist_name_object_finished" ]; then
echo "Working on object ${object} ..." echo "Working on object ${object} ..."
type=${object%%/*} type=${object%%/*}
@ -86,7 +86,7 @@ while [ "$__cdist_object_created_new" = 1 ]; do
__cdist_exit_err "${newobject} already exists, merge failed." __cdist_exit_err "${newobject} already exists, merge failed."
else else
# Fine, merge back! FIXME: touch correct here? # 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" pax -r -w "$newobject" "$__cdist_object_dir"
fi fi
done < "$__cdist_tmp_file" done < "$__cdist_tmp_file"