Merge remote-tracking branch 'ansgar/pu/multiarchive-2'

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

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 6c28e21cb5247f781a851b6e86837cc17665f264..382dd1a9c85926d750ff2dc905dc5287803691e4 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -3,21 +3,30 @@
 # Executed hourly via cron, out of dak's crontab.
 
 set -e
+set -o pipefail
 set -u
 
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+PROGRAM="Hourly"
+########################################################################
+# Functions                                                            #
+########################################################################
+# common functions are "outsourced"
+. "${configdir}/common"
+
 dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
-dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates -r $webdir/stat
+dak queue-report -8 -d new,byhand,stable-new,oldstable-new -r $webdir/stat
 dak show-deferred -r $webdir/stat > ${webdir}/deferred.html
-dak graph -n new,byhand,proposedupdates,oldproposedupdates,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
+dak graph -n new,byhand,p-u-new,o-p-u-new,deferred -r $webdir/stat -i $webdir/stat -x $scriptsdir/rrd-release-freeze-dates
 
 # do not run show-new and other stuff in parallel
 LOCKFILE="$lockdir/unchecked.lock"
 if lockfile -r16 $LOCKFILE 2> /dev/null; then
-    dak show-new > /dev/null
+    do_new
+    dak show-new > /dev/null || true
     rm -f $LOCKFILE
 fi