fix out-of-date vs. uncompiled handling for accepted building

diff --git a/apt.conf.buildd b/apt.conf.buildd
index 74322d4a45ef7c9476207e450f1c528c76227b4b..050fe5edee7b9ac910887685e9155986bd73c99b 100644 (file)
--- a/apt.conf.buildd
+++ b/apt.conf.buildd
@@ -7,8 +7,8 @@ Dir
 
 Default
 {
-   Packages::Compress ". gzip"; // both created for quinn-diff ease
-   Sources::Compress ". gzip";
+   Packages::Compress "gzip";
+   Sources::Compress "gzip";
    DeLinkLimit 0;
    FileMode 0664;
 }
@@ -24,5 +24,4 @@ bindirectory "incoming"
    BinCacheDB "packages-accepted.db";
    
    PathPrefix "";
-   Packages::Extensions ".deb .udeb";
 };

diff --git a/cron.buildd b/cron.buildd
index 431da4ca8fc8be6a27786a859cf1d98c73c1edab..6d4c5dfe17345f72df765603cd9faf62216fad85 100644 (file)
--- a/cron.buildd
+++ b/cron.buildd
@@ -28,9 +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
        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
                wanna-build -A $a -b $a/build-db --merge-packages Packages 2>/dev/null
        done
+       rm -f Sources Packages
        fi
 fi