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

do not exit if a type does not have explorer :-) 

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-07-27 01:27:05 +02:00
parent 6d3053a9bc
commit 3a1bf25398
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/cdist-deploy-to
View File

@ -55,9 +55,9 @@ __cdist_dir push "${__cdist_core_dir}" "${__cdist_remote_core_dir}"
__cdist_explorer_run_global __cdist_explorer_run_global
__cdist_manifest_run_init __cdist_manifest_run_init
__cdist_object_all __cdist_object_prepare __cdist_object_all __cdist_object_prepare
__cdist_object_all __cdist_object_run
exit 1 exit 1
__cdist_object_all __cdist_object_run
__cdist_cache __cdist_cache
__cdist_echo info "cdist $__cdist_version: Successfully finished run" __cdist_echo info "cdist $__cdist_version: Successfully finished run"

5
core/__cdist_object_explorer_run
View File

@ -26,15 +26,16 @@
__cdist_object_explorer_run() __cdist_object_explorer_run()
{ {
set -x
__cdist_object_self="$1"; shift __cdist_object_self="$1"; shift
__cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")" __cdist_object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")" __cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
# Check if type of object has >= 1 explorer # Check if type of object has >= 1 explorer
__cdist_has_explorer="$(__cdist_dir_listing "$(__cdist_type_explorer_dir "$__cdist_type")")" __cdist_has_explorer="$(__cdist_dir_listing "$(__cdist_type_explorer_dir "$__cdist_type")" | wc -l)"
# Run the type explorers for the current object if any # Run the type explorers for the current object if any
if [ "$__cdist_has_explorer" ]; then if [ "$__cdist_has_explorer" -ge 1 ]; then
if ! __cdist_type_explorer_pushed "$__cdist_type"; then if ! __cdist_type_explorer_pushed "$__cdist_type"; then
# FIXME: variables! # FIXME: variables!
src_dir="$(__cdist_type_explorer_dir "$__cdist_type")" src_dir="$(__cdist_type_explorer_dir "$__cdist_type")"