also name source of object when running type manifests
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
3f39c809b0
commit
30c2b017d4
2 changed files with 6 additions and 3 deletions
|
@ -78,8 +78,12 @@ while [ "$__cdist_new_objects_created" = "y" ]; do
|
|||
|
||||
# Verify no conflicting objects have been created
|
||||
while read __cdist_new_object; do
|
||||
grep -q "^$__cdist_new_object\$" "$__cdist_objects_list" && \
|
||||
__cdist_exit_err "${__cdist_manifest}: Tried to recreate ${__cdist_new_object}"
|
||||
__cdist_object_found=$(grep "^$__cdist_new_object\$" "$__cdist_objects_list" || true)
|
||||
|
||||
if [ "$__cdist_object_found" ]; then
|
||||
__cdist_object_source="$(cat "$(__cdist_object_dir "$__cdist_new_object")/${__cdist_name_object_source}")"
|
||||
__cdist_exit_err "${__cdist_manifest}: ${__cdist_new_object} already exists (source: $__cdist_object_source)"
|
||||
fi
|
||||
done < "$__cdist_new_objects_list"
|
||||
|
||||
# Safe harbour: We can merge all objects into main tree
|
||||
|
|
|
@ -15,7 +15,6 @@
|
|||
* Bugfix: Remove obsolete $@ call in cdist-remote-explorer-run
|
||||
* Bugfix: Correct manpage for __removeline (broke manpage generation)
|
||||
|
||||
|
||||
1.2.0: 2011-03-19
|
||||
* Added dependencies (see cdist-type(7))
|
||||
* New type __removeline (Daniel Roth)
|
||||
|
|
Loading…
Reference in a new issue