Merge branch 'edos-debcheck' of git://git.debian.org/users/nomeata/wanna-build into...

diff --combined trigger.daily
index c8222958b0bdd0eb0222d470cba0461ec4e1013b,1dca3bb3cc97c029dc9c09854d50237e73401e1f..2d4380621918f65aed3f80e4aca71c870354af6f
--- 1/trigger.daily
--- 2/trigger.daily
+++ b/trigger.daily
@@@ -8,7 -8,7 +8,7 @@@
  #     Sources.* == uncompressed, concat'd version
  
  LANG=C
- PATH="/bin:/usr/bin"
+ PATH="/bin:/usr/bin:/org/wanna-build/bin"
  #testing must be before unstable so late upld don't build for testing needlessly
  DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable"
  # While oldstable is purged
@@@ -118,15 -118,20 +118,20 @@@ for d in $DISTS; d
  # double builds.
  #
      if [ "$d" = "unstable" ]; then
-       rm -f "Sources.$d.base"
-       cp "Sources.$d" "Sources.$d.base"
-       curl_index "$MASTERBUILDD/Sources.gz" "Sources-$d.accepted.gz" "Sources.$d"
+       mv "Sources.$d" "Sources.$d.base"
+       curl_index "$MASTERBUILDD/Sources.gz" "Sources-$d.accepted.gz" "/dev/null"
+       rm -f "Sources-$d.accepted"
+       gunzip "Sources-$d.accepted.gz"
+       keep-latest source "Sources.$d.base" "Sources-$d.accepted" > "Sources.$d"
+ 
        curl_index "$MASTERBUILDD/Packages.gz" "Packages-$d.accepted.gz" "/dev/null"
+       rm -f "Packages-$d.accepted"
+       gunzip "Packages-$d.accepted.gz"
  
        for a in $ARCHS; do
-           rm -f "Packages.$d.$a.base"
-           cp "Packages.$d.$a" "Packages.$d.$a.base"
+           mv "Packages.$d.$a" "Packages.$d.$a.base"
            gzip -dc "Packages-$d.accepted.gz" >> "Packages.$d.$a"
+           keep-latest $a "Packages.$d.$a.base" "Packages-$d.accepted" > "Packages.$d.$a"
        done
      else
        if [ -e "Sources.$d-p-u" ]; then
@@@ -227,7 -232,7 +232,7 @@@ if (( $last + $interval < $now )); the
        rm -f "$LOCKFILE"
        trap - 0
        /srv/buildd.debian.org/bin/makegraph
 -      for a in $ARCHS_stable; do
 +      for a in $ALL_ARCHES; do
            echo Last Updated: `date -u` > /srv/buildd.debian.org/web/stats/$a.txt
            for d in $STATS_DISTS; do
                /srv/wanna-build/bin/wanna-build-statistics --database=$a/build-db --dist=$d >> /srv/buildd.debian.org/web/stats/$a.txt