From: Torsten Werner <twerner@debian.org>
Date: Tue, 4 Jan 2011 19:06:28 +0000 (+0100)
Subject: secure show-new by unchecked.log
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f694e88353ff776f325011ca962f1be8c2e718f1;hp=e91ef200b8c56134796099d685385f3dfd704859;p=dak.git

secure show-new by unchecked.log

... to avoid parallel execution of dak

Signed-off-by: Torsten Werner <twerner@debian.org>
---

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