evilham
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'sans/master'

This commit is contained in:
Nico Schottelius 2011-02-14 12:26:23 +01:00
parent fafb427928 a7fc721488
commit 2e717cc50c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cdist-manifest-recursive-run
View File

@ -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 "${object}/$__cdist_object_finished" touch "${newobject}/$__cdist_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"