dak/new_security_install.py: Update for multiarchive changes.

[dak.git] / config / debian-security / cron.weekly

diff --git a/config/debian-security/cron.weekly b/config/debian-security/cron.weekly
index ddc12ac55c361237d3e0d84e163e6508d89584ee..8843ac1c043be612cda3a2dcf5b7f750cc46a606 100755 (executable)
--- a/config/debian-security/cron.weekly
+++ b/config/debian-security/cron.weekly
@@ -1,19 +1,37 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Executed weekly via cron, out of dak's crontab.
 
 set -e
-export SCRIPTVARS=/org/security-master.debian.org/dak/config/debian-security/vars
+set -o pipefail
+export SCRIPTVARS=/srv/security-master.debian.org/dak/config/debian-security/vars
 . $SCRIPTVARS
 
+LOCKFILE="$lockdir/unchecked.lock"
+
 ################################################################################
 
 # Weekly generation of release files, then pushing mirrors.
 # Used as we have a "Valid-until" field in our release files of 10 days. In case
 # we dont have a security update in that time...
-cd $masterdir
+cd $configdir
+
+cleanup() {
+    rm -f "$LOCKFILE"
+}
+
+if ! lockfile -r100 "$LOCKFILE"; then
+    echo "Could not lock $LOCKFILE. Assuming resigning is not needed."
+    exit 0
+fi
+trap cleanup EXIT
+
 dak generate-releases
-/org/security-master.debian.org/dak/config/debian-security/make-mirror.sh
+
+cleanup
+trap - EXIT
+
+/srv/security-master.debian.org/dak/config/debian-security/make-mirror.sh
 sudo -u archvsync -H /home/archvsync/signal_security