X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.buildd;h=03c383f8b5af95ba40f38e78def55b4cf7c6666f;hb=2d5a651910c9084ec4c6e3656dfb0d4d51b6bcc2;hp=6d4c5dfe17345f72df765603cd9faf62216fad85;hpb=bbe8e6c44306673cd54f726b1fe168a34fe67728;p=dak.git

diff --git a/cron.buildd b/cron.buildd
index 6d4c5dfe..03c383f8 100644
--- a/cron.buildd
+++ b/cron.buildd
@@ -18,7 +18,7 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
 	trap cleanup 0
         cd $overridedir
         denise &>/dev/null
-        rm -f override.sid.all3
+        rm -f override.sid.all3 override.sid.all3.src
         for i in main contrib non-free main.debian-installer; do
 		cat override.sid.$i >> override.sid.all3
 		if [ "$i" != "main.debian-installer" ]; then
@@ -28,10 +28,12 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
 	cd $masterdir
 	apt-ftparchive -qq generate apt.conf.buildd
 	cd /org/incoming.debian.org/buildd
-	gzip -cd Sources.gz | cat /org/wanna-build/tmp/Sources.unstable-old - > Sources
+	cp /org/wanna-build/tmp/Sources.unstable-old Sources
+	gzip -cd Sources.gz >> Sources
 	for a in $ARCHS; do
-		gzip -cd Packages.gz | cat /org/wanna-build/tmp/Packages.unstable.$a-old > Packages
-		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
+	        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