From: Joerg Jaspert Date: Mon, 22 Jun 2009 20:26:57 +0000 (+0200) Subject: use error instead of ERR X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e852147a696f24471c44d4d58ca1c09b6cbb2a3;p=dak use error instead of ERR Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 09415bea..a7d901af 100755 --- a/config/debian/cron.dinstall +++ b/config/debian/cron.dinstall @@ -58,7 +58,6 @@ function cleanup() { # If we error out this one is called, *FOLLOWED* by cleanup above function onerror() { ERRDATE=$(date "+%Y.%m.%d-%H:%M:%S") - error=${ERR:-"false"} subject="ATTENTION ATTENTION!" if [ "${error}" = "false" ]; then @@ -457,6 +456,8 @@ function stage() { ARGS='GO[@]' local "${!ARGS}" + error=${ERR:-"false"} + STAGEFILE="${stagedir}/${FUNC}" if [ -f "${STAGEFILE}" ]; then stamptime=$(/usr/bin/stat -c %Z "${STAGEFILE}") @@ -486,7 +487,7 @@ function stage() { exit 42 fi - if [ "${ERR}" = "false" ]; then + if [ "${error}" = "false" ]; then set +e fi ${FUNC} ${ARGS}