config/debian/*: update for multiarchive changes

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

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 21fe3b893cd25d39dcbd22967de0c112f19467e7..9f2266d8f1cdb6f3174379b73637b3653df22ac8 100755 (executable)
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -3,6 +3,7 @@
 # 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
@@ -11,15 +12,16 @@ export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 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 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 show-deferred -r $webdir/stat > ${webdir}/deferred.html
+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
-#    rm -f $LOCKFILE
-#fi
+LOCKFILE="$lockdir/unchecked.lock"
+if lockfile -r16 $LOCKFILE 2> /dev/null; then
+    do_new
+    dak show-new > /dev/null || true
+    rm -f $LOCKFILE
+fi
 
 cd $webdir
 cat removals-20*.txt > removals-full.txt
@@ -27,7 +29,7 @@ cat removals.txt >> removals-full.txt
 cat removals-20*.822 > removals-full.822
 cat removals.822 >> removals-full.822
 
-#$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/
+$base/dak/tools/queue_rss.py -q $queuedir/new -o $webdir/rss/ -d $base/misc -l $base/log/
 $base/dak/tools/removals.pl $configdir/removalsrss.rc > $webdir/rss/removals.rss