tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rename cdist-object-process to cdist-object-prepare

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-04-05 22:55:46 +02:00
commit 71765210bb
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
bin/cdist-config
View file

@ -55,7 +55,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
: ${__cdist_name_manifest:=manifest} : ${__cdist_name_manifest:=manifest}
: ${__cdist_name_object:=object} : ${__cdist_name_object:=object}
: ${__cdist_name_object_finished:=done} : ${__cdist_name_object_finished:=done}
: ${__cdist_name_object_processed:=processed} : ${__cdist_name_object_prepared:=prepared}
: ${__cdist_name_object_id:=object_id} : ${__cdist_name_object_id:=object_id}
: ${__cdist_name_object_source:=source} : ${__cdist_name_object_source:=source}
: ${__cdist_name_objects_created:=.objects_created} : ${__cdist_name_objects_created:=.objects_created}
@ -210,9 +210,9 @@ __cdist_object_code()
echo "$(__cdist_object_dir "$1")/${__cdist_name_code}" echo "$(__cdist_object_dir "$1")/${__cdist_name_code}"
} }
__cdist_object_processed() __cdist_object_prepared()
{ {
echo "$(__cdist_object_dir "$1")/${__cdist_name_object_processed}" echo "$(__cdist_object_dir "$1")/${__cdist_name_object_prepared}"
} }
__cdist_object_finished() __cdist_object_finished()

2
bin/cdist-deploy-to
View file

@ -49,7 +49,7 @@ cdist-dir push "$__cdist_target_host" \
"${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}" "${__cdist_abs_mydir}" "${__cdist_remote_bin_dir}"
cdist-explorer-run-global "$__cdist_target_host" cdist-explorer-run-global "$__cdist_target_host"
cdist-manifest-run-init "$__cdist_target_host" cdist-manifest-run-init "$__cdist_target_host"
cdist-object-all "$__cdist_target_host" cdist-object-process cdist-object-all "$__cdist_target_host" cdist-object-prepare
cdist-object-all "$__cdist_target_host" cdist-object-run cdist-object-all "$__cdist_target_host" cdist-object-run
cdist-cache "$__cdist_target_host" cdist-cache "$__cdist_target_host"

10
bin/cdist-object-process → bin/cdist-object-prepare
View file

@ -36,13 +36,13 @@ __cdist_object_dir="$(__cdist_object_dir "$__cdist_object")"
# Export to non-core for use in manifest and gencode scripts # Export to non-core for use in manifest and gencode scripts
export $__cdist_name_var_self=$__cdist_object export $__cdist_name_var_self=$__cdist_object
__cdist_object_processed="$(__cdist_object_processed "$__cdist_object")" __cdist_object_prepared="$(__cdist_object_prepared "$__cdist_object")"
if [ ! -f "$__cdist_object_processed" ]; then if [ ! -f "$__cdist_object_prepared" ]; then
echo echo
echo "Processing object $__cdist_object" echo "Preparing object $__cdist_object"
cdist-object-explorer-run "$__cdist_target_host" "$__cdist_object" cdist-object-explorer-run "$__cdist_target_host" "$__cdist_object"
cdist-object-manifest-run "$__cdist_target_host" "$__cdist_object" cdist-object-manifest-run "$__cdist_target_host" "$__cdist_object"
# Mark this object as processed # Mark this object as prepared
touch "$__cdist_object_processed" touch "$__cdist_object_prepared"
fi fi