X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cron.buildd;h=431da4ca8fc8be6a27786a859cf1d98c73c1edab;hb=c971b45357fa28fdbe04b2042d2f566ad6c30d78;hp=b248e8f55e085b723dc968de243826756d550c30;hpb=07d2cc08925280afb5b79e1fa15bd0eef9a21ad7;p=dak.git

diff --git a/cron.buildd b/cron.buildd
index b248e8f5..431da4ca 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -11,7 +11,7 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
 
 if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
-	if lockfile -! -r3 $LOCKFILE; then
+	if lockfile -r3 $LOCKFILE; then
 	cleanup() {
 		rm -f "$LOCKFILE"
 	}
@@ -19,12 +19,17 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
         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
 	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
+		quinn-diff -i -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