Moron. Test your changes.

[dak.git] / wanna-build / trigger.daily

diff --git a/wanna-build/trigger.daily b/wanna-build/trigger.daily
index ddb027e9bdb37c28adbdf93f8c09e02e3860a28c..e69a412a58dd5ab04ee5be426adf77d18447ac3c 100755 (executable)
--- a/wanna-build/trigger.daily
+++ b/wanna-build/trigger.daily
@@ -3,11 +3,14 @@
 # Updates wanna-build databases after the archive maintenance
 # finishes
 #
+# Files:
+#     Sources-* == upstream fetched file
+#     Sources.* == uncompressed, concat'd version
 PATH="/bin:/usr/bin"
-DISTS="unstable oldstable-security stable stable-security testing testing-security"
+#testing must be before unstable so late upld don't build for testing needlessly
+DISTS="stable stable-security testing testing-security unstable"
 SECTIONS="main contrib non-free"
-ARCHS_oldstable="m68k arm sparc alpha powerpc i386"
-ARCHS_stable="mips mipsel ia64 hppa s390 $ARCHS_oldstable"
+ARCHS_stable="m68k arm sparc alpha powerpc i386 mips mipsel ia64 hppa s390"
 ARCHS_testing="$ARCHS_stable"
 ARCHS_unstable="$ARCHS_testing hurd-i386 sh"
 TMPDIR="/org/wanna-build/tmp"
@@ -47,9 +50,6 @@ cd $TMPDIR
 for d in $DISTS ; do
        dist=`echo $d | sed s/-.*$//`
        case "$dist" in
-               oldstable)
-                       ARCHS="$ARCHS_oldstable"
-                       ;;
                stable)
                        ARCHS="$ARCHS_stable"
                        ;;
@@ -140,30 +140,11 @@ for d in $DISTS ; do
                fi
        done
 
-       if [ "$d" = "oldstable" ]; then
-               gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Sources.gz >> Sources.$d
-               if "$NON_US" = "true" ]; then
-                       rm -f Sources.gz
-                       if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Sources.gz; then
-                               mv Sources.gz Sources-non-us.p-u.gz
-                       fi
-                       gzip -dc Sources-non-us.p-u.gz >> Sources.$d
-                       rm -f Packages.gz
-                       if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Packages.gz; then
-                               mv Packages.gz Packages-non-us.p-u.gz
-                       fi
-               fi
-                       
-               for a in $ARCHS ; do
-                       gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Packages.gz >> Packages.$d.$a
-                       gzip -dc Packages-non-us.p-u.gz >> Packages.$d.$a
-               done
-       fi
        for a in $ARCHS ; do
-               if [ "$d" = "unstable" ]; then
+               if [ "$d" = "unstable" -o ! -e "quinn-unstable.$a-old" ]; then
                        quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.$d -p Packages.$d.$a >> quinn-$d.$a
                else
-                       quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.$d -p Packages.$d.$a | fgrep -v -f quinn-unstable.$a >> quinn-$d.$a
+                       quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.$d -p Packages.$d.$a | fgrep -v -f quinn-unstable.$a-old >> quinn-$d.$a
                fi
        done
 done
@@ -175,11 +156,6 @@ for a in $ARCHS_unstable ; do
        for d in $DISTS ; do
                dist=`echo $d | sed s/-.*$//`
                case "$dist" in
-                       oldstable)
-                               if echo $ARCHS_oldstable | grep -q -v "\b$a\b"; then
-                                       continue
-                               fi
-                               ;;
                        stable)
                                if echo $ARCHS_stable | grep -q -v "\b$a\b"; then
                                        continue