two bug fixes in source_exists changes

[dak.git] / cron.buildd

diff --git a/cron.buildd b/cron.buildd
index 431da4ca8fc8be6a27786a859cf1d98c73c1edab..03c383f8b5af95ba40f38e78def55b4cf7c6666f 100644 (file)
--- 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,9 +28,14 @@ if [ ! -e "$ftpdir/Archive_Maintenance_In_Progress" ]; then
        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 -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
        fi
 fi