always add source, even if everything went successful...

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
remotes/origin/1.4
Nico Schottelius 14 years ago
parent 914ec3104e
commit 4d2e03b966
  1. 6
      bin/cdist-type-emulator

@ -168,9 +168,6 @@ if [ -e "${__cdist_object_dir}" ]; then
cat "$__cdist_tmp_file" cat "$__cdist_tmp_file"
__cdist_exit_err "Aborting due to object conflict." __cdist_exit_err "Aborting due to object conflict."
fi fi
# Add ourselves, if we're compatible
__cdist_object_source_add "${__cdist_object_dir}"
else else
# #
# Move object into tree: # Move object into tree:
@ -180,3 +177,6 @@ else
mkdir -p "$__cdist_new_object_base_dir" mkdir -p "$__cdist_new_object_base_dir"
mv "$__cdist_new_object_dir" "$__cdist_new_object_base_dir" mv "$__cdist_new_object_dir" "$__cdist_new_object_base_dir"
fi fi
# Add "I was here message"
__cdist_object_source_add "${__cdist_object_dir}"

Loading…
Cancel
Save