xanderio/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

only append source in final tree, otherwise we always conflict

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-03-24 10:27:05 +01:00
parent 762c0b4935
commit 914ec3104e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bin/cdist-type-emulator
View file

@ -73,9 +73,8 @@ __cdist_out_object_dir="$__cdist_tmp_dir"
__cdist_new_object_dir="$(__cdist_object_dir "$__cdist_object_self")" __cdist_new_object_dir="$(__cdist_object_dir "$__cdist_object_self")"
# Record source # Initialise object
mkdir -p "${__cdist_new_object_dir}" mkdir -p "${__cdist_new_object_dir}"
__cdist_object_source_add "${__cdist_new_object_dir}"
# Record parameter # Record parameter
__cdist_parameter_dir="$(__cdist_object_parameter_dir "$__cdist_object_self")" __cdist_parameter_dir="$(__cdist_object_parameter_dir "$__cdist_object_self")"