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

rename no_new_object to new_objects_created (more intuitive)

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-02-17 09:34:59 +01:00
commit 1d796e6ed1
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
bin/cdist-manifest-run-all
View file

@ -38,13 +38,13 @@ objectlist="${__cdist_tmp_dir}/objectfile"
newobjectlist="${__cdist_tmp_dir}/newobjectfile" newobjectlist="${__cdist_tmp_dir}/newobjectfile"
newobjects="${__cdist_tmp_dir}/newobjects" newobjects="${__cdist_tmp_dir}/newobjects"
no_new_object=n new_objects_created=y
# Loop until we do not create new objects anymore # Loop until we do not create new objects anymore
# which is equal to all objects have been run # which is equal to all objects have been run
while [ "$no_new_object" = "n" ]; do while [ "$new_objects_created" = "y" ]; do
# assume we're done after this run # assume we're done after this run
no_new_object=y new_objects_created=n
# find all objects (every object has the source recorded) # find all objects (every object has the source recorded)
__cdist_object_list "$__cdist_object_base_dir" > "$objectlist" __cdist_object_list "$__cdist_object_base_dir" > "$objectlist"
@ -71,12 +71,10 @@ while [ "$no_new_object" = "n" ]; do
__cdist_exit_err "${manifest} tried to recreate ${newobject}" __cdist_exit_err "${manifest} tried to recreate ${newobject}"
done < "$newobjectlist" done < "$newobjectlist"
# Safe harbour: We can merge all objects into main tree # Safe harbour: We can merge all objects into main tree
# Merge = mkdir + mv parameters # Merge = mkdir + mv parameters and source information
while read newobject; do while read newobject; do
# Unset no_new_object - only once needed... FIXME (beautify) [ "$new_objects_created" = "n" ] && new_objects_created="y"
no_new_object="n"
set -x set -x
# where to save the newly created object # where to save the newly created object
@ -106,6 +104,5 @@ while [ "$no_new_object" = "n" ]; do
# done with this object # done with this object
touch "$cur_object_dir/$__cdist_name_object_finished" touch "$cur_object_dir/$__cdist_name_object_finished"
done < "$objectlist" done < "$objectlist"
done done