Merge remote-tracking branch 'sans/master'

This commit is contained in:
Nico Schottelius 2011-02-14 12:26:23 +01:00
commit 2e717cc50c

View file

@ -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 "${object}/$__cdist_object_finished"
touch "${newobject}/$__cdist_object_finished"
pax -r -w "$newobject" "$__cdist_object_dir"
fi
done < "$__cdist_tmp_file"