X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.buildd;h=4870e7ffc9be491d96aab9962af671dc7fbac727;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=0907b15c991d3f32302493871dfb5dd0e79fb9d3;hpb=a28cb5af382c0a7601451f65b90def4ab69021e4;p=dak.git

diff --git a/cron.buildd b/cron.buildd
index 0907b15c..4870e7ff 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -10,20 +10,21 @@ export SCRIPTVARS=/org/ftp.debian.org/katie/vars
 
 LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
 
-if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" -a lockfile -! -r3 $LOCKFILE ]; then
+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
-	cd $masterdir
-	apt-ftparchive -qq generate apt.conf.buildd
 	cd /org/incoming.debian.org/buildd
+	cp /org/wanna-build/tmp/Sources.unstable-old Sources
+	gzip -cd Sources.gz >> Sources
 	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
+	        cp /org/wanna-build/tmp/Packages.unstable.$a-old Packages
+		gzip -cd /org/incoming.debian.org/buildd/Packages.gz >> Packages
+		quinn-diff -i -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -A $a 2>/dev/null | perl -pi -e 's#^(non-US/)?(non-free)/.*$##msg' | 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
+	rm -f Sources Packages
+	fi
 fi