Merge remote-tracking branch 'sans/master'

2011-02-14 12:26:23 +01:00 · 2011-02-14 12:26:23 +01:00 · 2e717cc50c
parent fafb427928 a7fc721488
commit 2e717cc50c
1 changed files with 1 additions and 1 deletions
--- a/bin/cdist-manifest-recursive-run
+++ b/bin/cdist-manifest-recursive-run
@ -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"