Merge branch 'master' into dbtests

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

diff --git a/config/debian/cron.daily b/config/debian/cron.daily
index 1815260c0338edbd529205073770df4c7789502a..0e7f7da4e580ebcff42c4ab5a3dba48e32c4a315 100755 (executable)
--- a/config/debian/cron.daily
+++ b/config/debian/cron.daily
@@ -7,16 +7,35 @@ set -u
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+# common functions are "outsourced"
+. "${configdir}/common"
+
 ################################################################################
 
+TMPFILE=$( mktemp -p ${TMPDIR} )
+
+function cleanup {
+    ERRVAL=$?
+    rm -f ${TMPFILE}
+    exit ${ERRVAL}
+}
+trap cleanup SIGHUP SIGINT SIGPIPE SIGTERM EXIT ERR
+
+# log to dinstall's logfile instead of sending email
+PROGRAM="cron.daily"
+LOGFILE="$logdir/dinstall.log"
+exec >> "$LOGFILE" 2>&1
 
 # get the latest list of wnpp bugs and their source packages
-if $( wget -q -O/srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp http://qa.debian.org/data/bts/wnpp_rm ) ; then
-    mv /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
-else
-    if [ -f /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp ] ; then
-        rm /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm.tmp
-    fi
-fi
+wget -q -O${TMPFILE} http://qa.debian.org/data/bts/wnpp_rm
+chmod go+r ${TMPFILE}
+mv ${TMPFILE} /srv/ftp-master.debian.org/scripts/masterfiles/wnpp_rm
+
+reports
+
+clean_debbugs
+
+# Generate list of override disparities
+dak override-disparity | gzip -9 > ${webdir}/override-disparity.gz
 
 ################################################################################