matthijs/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
commit 3c3dad1842
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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"