use error instead of ERR

[dak.git] / config / debian / cron.unchecked

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index e18f8635d62a50bbfe966d765867142b311c7ab5..b3c078e30d3925ba565782627e34462e67656b5d 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -20,6 +20,10 @@
 set -e
 # make sure to only use defined variables
 set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
 
 # import the general variable set.
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
@@ -30,6 +34,9 @@ LOCKFILE="$lockdir/unchecked.lock"
 LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
 
+# our name
+PROGRAM="unchecked"
+
 if [ -e $NOTICE ]; then
     exit 0;
 fi
@@ -72,7 +79,7 @@ function do_buildd () {
 # the actual unchecked functions follow                                #
 ########################################################################
 
-lockfile "$LOCK_NEW"
+lockfile -r3 "$LOCK_NEW"
 acceptnew
 rm -f "$LOCK_NEW"