fix incorrectly inverted lockfile check

[dak.git] / cron.buildd

diff --git a/cron.buildd b/cron.buildd
index d678713cd7f4edcd349491c0812fbcf49badf8cc..5c59408a5d65870e02ced32c4e634b2cb1eb936e 100644 (file)
--- a/cron.buildd
+++ b/cron.buildd
@@ -8,11 +8,23 @@ set -e
 export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 . $SCRIPTVARS
 
-if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
+LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
+
+if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
+       if lockfile -r3 $LOCKFILE; then
+       cleanup() {
+               rm -f "$LOCKFILE"
+       }
+       trap cleanup 0
         cd $overridedir
         denise &>/dev/null
         rm -f override.sid.all3
-        for i in main contrib non-free main.debian-installer; do cat override.sid.$i >> override.sid.all3; done
+        for i in main contrib non-free main.debian-installer; do
+               cat override.sid.$i >> override.sid.all3
+               if [ "$i" != "main.debian-installer" ]; then
+                       cat override.sid.$i.src >> override.sid.all3.src
+               fi
+       done
        cd $masterdir
        apt-ftparchive -qq generate apt.conf.buildd
        cd /org/incoming.debian.org/buildd
@@ -20,4 +32,5 @@ if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then
                quinn-diff -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | grep -v ^non-free | wanna-build -b $a/build-db --merge-partial-quinn 2> /dev/null
                wanna-build -A $a -b $a/build-db --merge-packages Packages 2>/dev/null
        done
+       fi
 fi