add changelog back

[dak.git] / cron.buildd

diff --git a/cron.buildd b/cron.buildd
index 3327dd6ca72897c6d0701f330a0e01ceb7a419af..4870e7ffc9be491d96aab9962af671dc7fbac727 100644 (file)
--- a/cron.buildd
+++ b/cron.buildd
@@ -11,26 +11,20 @@ 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"
        }
        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
-               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
+       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