From: Torsten Werner <twerner@debian.org>
Date: Tue, 4 Jan 2011 19:53:41 +0000 (+0100)
Subject: Merge remote branch 'dktrkranz/show-new'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b4aac1757c9a8479a90b947d27365fc4cdbdcc84;hp=a392c3dfdf54fab308b0600119aaa1f2b55e8fd5;p=dak.git

Merge remote branch 'dktrkranz/show-new'
---

diff --git a/config/debian/cron.hourly b/config/debian/cron.hourly
index 30e81b59..ccfbe38c 100755
--- a/config/debian/cron.hourly
+++ b/config/debian/cron.hourly
@@ -12,7 +12,13 @@ dak import-users-from-passwd
 dak queue-report -n > $webdir/new.html
 dak queue-report -8 -d new,byhand,proposedupdates,oldproposedupdates
 dak show-deferred > ${webdir}/deferred.html
-dak show-new > /dev/null
+
+# 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
 
 cd $webdir
 cat removals-20*.txt > removals-full.txt