From: wanna-build admin <wbadm@raff.debian.org>
Date: Wed, 29 Jul 2009 18:24:55 +0000 (+0000)
Subject: Merge branch 'edos-debcheck' of git://git.debian.org/users/nomeata/wanna-build into... 
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ca63323f793d72b60f0574eb4202eb3a0c64618f;hp=-c;p=wannabuild.git

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

ca63323f793d72b60f0574eb4202eb3a0c64618f
diff --combined trigger.daily
index c822295,1dca3bb..2d43806
--- a/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