matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

begin merge section in cdist-type-emulator

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-03-23 12:15:00 +01:00
commit 2ef17f9bf2
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bin/cdist-type-emulator
View file

@ -149,14 +149,18 @@ exit 1
################################################################################ ################################################################################
# Merge object # Merge object
# #
# Save original destination
__cdist_out_object_dir="$__cdist_out_object_dir_orig"
__cdist_object_destination_dir="$(__cdist_object_dir "$__cdist_object_self")"
# #
# Ensure that only optional or required parameters are given # If the object already exists and is exactly the same, merge it. Otherwise fail.
# #
if [ -e "${__cdist_new_object_dir}" ]; then
source="$(__cdist_object_source "${__cdist_new_object_dir}")"
__cdist_exit_err "${__cdist_object} already exists (source: $source)"
# old stuff
# if [ -e "${__cdist_new_object_dir}" ]; then fi
# source="$(__cdist_object_source "${__cdist_new_object_dir}")"
# __cdist_exit_err "${__cdist_object} already exists (source: $source)"
# fi