From 914ec3104ea1b2c1e4a7b524189615c84949a1f7 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 24 Mar 2011 10:27:05 +0100 Subject: [PATCH] only append source in final tree, otherwise we always conflict Signed-off-by: Nico Schottelius --- bin/cdist-type-emulator | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/cdist-type-emulator b/bin/cdist-type-emulator index 088286e9..32f3ccb2 100755 --- a/bin/cdist-type-emulator +++ b/bin/cdist-type-emulator @@ -73,9 +73,8 @@ __cdist_out_object_dir="$__cdist_tmp_dir" __cdist_new_object_dir="$(__cdist_object_dir "$__cdist_object_self")" -# Record source +# Initialise object mkdir -p "${__cdist_new_object_dir}" -__cdist_object_source_add "${__cdist_new_object_dir}" # Record parameter __cdist_parameter_dir="$(__cdist_object_parameter_dir "$__cdist_object_self")"