X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.buildd;h=5c59408a5d65870e02ced32c4e634b2cb1eb936e;hb=5ac1ebcc6c8514198de83318de2decbc1deeec9e;hp=89f86f2749ee750edf630cffde98dbee81c06433;hpb=3110054dd5174494b14ae52e971dcd9d3c005bd7;p=dak.git

diff --git a/cron.buildd b/cron.buildd
index 89f86f27..5c59408a 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -2,23 +2,35 @@
 #
 # Executed hourly via cron, out of katie's crontab.
 
-ARCHS="alpha hppa i386 ia64 mips mipsel powerpc sparc s390"
+ARCHS="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390"
 
 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
+        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
-	cameron
 	apt-ftparchive -qq generate apt.conf.buildd
 	cd /org/incoming.debian.org/buildd
 	for a in $ARCHS; do
 		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