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

++__cdist_exit_err

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-04-06 21:22:44 +02:00
commit c0a83f9d85
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/cdist-object-run
View file

@ -52,7 +52,7 @@ if [ ! -f "$__cdist_object_finished" ]; then
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
__cdist_requirement="$1"; shift __cdist_requirement="$1"; shift
echo "Resolving dependency $__cdist_requirement" __cdist_echo info "Resolving dependency $__cdist_requirement"
cdist-object-run "$__cdist_target_host" "$__cdist_requirement" cdist-object-run "$__cdist_target_host" "$__cdist_requirement"
done done
fi fi

6
bin/cdist-remote-explorer-run
View file

@ -55,16 +55,14 @@ for explorer in "$__cdist_explorer_dir/"*; do
if [ -f "$explorer" ]; then if [ -f "$explorer" ]; then
if [ ! -x "$explorer" ]; then if [ ! -x "$explorer" ]; then
echo "Explorer \"$explorer\" exists, but is not executable." >&2 __cdist_exit_err "Explorer \"$explorer\" exists, but is not executable."
exit 1
fi fi
# Execute explorers and save results in remote destination directory # Execute explorers and save results in remote destination directory
"$explorer" > "${__cdist_my_out_dir}/$explorer_name" "$explorer" > "${__cdist_my_out_dir}/$explorer_name"
else else
if [ -e "$explorer" ]; then if [ -e "$explorer" ]; then
echo "Explorer \"$explorer\" exists, but is not a file." >&2 __cdist_exit_err "Explorer \"$explorer\" exists, but is not a file."
exit 1
fi fi
fi fi
done done