X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=b3c078e30d3925ba565782627e34462e67656b5d;hb=b612f3da207fa0d75a5d3b204ac8f02bb244231a;hp=77b7d88fd0c0ebf27694e5db385baa4b2d0ce95f;hpb=9e8a49aac094ee37db8abf38e46a42d7135437de;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 77b7d88f..b3c078e3 100755
--- 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
@@ -27,8 +31,12 @@ export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 
 LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
+LOCK_NEW="$lockdir/processnew.lock"
 NOTICE="$lockdir/daily.lock"
 
+# our name
+PROGRAM="unchecked"
+
 if [ -e $NOTICE ]; then
     exit 0;
 fi
@@ -71,7 +79,9 @@ function do_buildd () {
 # the actual unchecked functions follow                                #
 ########################################################################
 
+lockfile -r3 "$LOCK_NEW"
 acceptnew
+rm -f "$LOCK_NEW"
 
 # only run one cron.unchecked
 lockfile -r3 $LOCKFILE || exit 0
@@ -82,6 +92,4 @@ do_unchecked
 if [ ! -z "$changes" ]; then
     sync_debbugs
     do_buildd
-else
-    echo "$timestamp": Nothing to do >> $report
 fi