merge current master

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

bin/cdist-deploy-to

@@ -50,6 +50,7 @@ cdist-dir push "$__cdist_target_host" "${__cdist_abs_mydir}" "${__cdist_remote_b
 cdist-explorer-run-global     "$__cdist_target_host"
 cdist-manifest-run-init       "$__cdist_target_host"
 cdist-object-run-all          "$__cdist_target_host"
+cdist-cache                   "$__cdist_target_host"
 
 echo "cdist $__cdist_version: Successfully finished run on $__cdist_target_host"
 

bin/cdist-remote-explorer-run

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

build.sh

@@ -51,8 +51,8 @@ case "$1" in
    manbuild)
       for src in ${MAN1DSTDIR}/*.text ${MAN7DSTDIR}/*.text; do
          echo "Compiling manpage and html for $src"
-         $A2XM "$src" &
-         $A2XH "$src" &
+         $A2XM "$src"
+         $A2XH "$src"
       done
       wait
    ;;

conf/type/__process/explorer/runs

@@ -24,7 +24,7 @@
 if [ -f "$__object/parameter/name" ]; then
    name="$(cat "$__object/parameter/name")"
 else
-   name="$__object_id"
+   name="/$__object_id"
 fi
 
 pgrep -x -f "$name" || true