X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trigger.daily;h=2d4380621918f65aed3f80e4aca71c870354af6f;hb=77ac28042d3bfc1b53dfc5e98835a99f2d8af454;hp=73b17768113ac50dadb6c39620e6791de38bcc73;hpb=53e031de24ea63ceaf5d37c336566663452c9323;p=wannabuild.git

diff --git a/trigger.daily b/trigger.daily
index 73b1776..2d43806 100755
--- a/trigger.daily
+++ b/trigger.daily
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # Updates wanna-build databases after the archive maintenance
 # finishes
@@ -8,10 +8,11 @@
 #     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"
-DISTS="stable-security testing-security stable testing unstable"
+DISTS="oldstable-security stable-security testing-security oldstable stable testing unstable"
+# While oldstable is purged
+#DISTS="stable-security testing-security stable testing unstable"
 STATS_DISTS="unstable testing stable"
 SECTIONS="main contrib non-free"
 TMPDIR="/org/wanna-build/tmp"
@@ -41,7 +42,7 @@ echo Updating wanna-build databases...
 umask 027
 
 if [ "$DAY" = "0" ]; then
-	savelog -c 26 -p /srv/wanna-build/db/merge.log
+	savelog -c 64 -p /srv/wanna-build/db/merge.log
 fi
 
 exec 3<&1 >> /srv/wanna-build/db/merge.log 2>&1
@@ -117,15 +118,20 @@ for d in $DISTS; do
 # 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
@@ -158,7 +164,12 @@ echo "fetch and quinn completed: `date -u`"
 echo "fetch and quinn completed: `date -u`" >&3
 
 umask 002
-for a in $ARCHS_unstable ; do
+# Gross hack: we need a list of all architectures, because this loop
+# insists on iterating on arches and then suites, instead of the
+# opposite.
+ALL_ARCHES=$(echo $ARCHS_oldstable $ARCHS_stable $ARCHS_testing $ARCHS_unstable \
+	     | tr ' ' '\n' | sort -u)
+for a in $ALL_ARCHES ; do
 	wanna-build --create-maintenance-lock --database=$a/build-db
 
 	for d in $DISTS ; do
@@ -198,7 +209,7 @@ for a in $ARCHS_unstable ; do
 		mv quinn-$d.$a quinn-$d.$a-old
 	done
 	if [ "$DAY" = "0" ]; then
-		savelog -p -c 26 /srv/wanna-build/db/$a/transactions.log
+		savelog -p -c 128 /srv/wanna-build/db/$a/transactions.log
 	fi
 	wanna-build --remove-maintenance-lock --database=$a/build-db
 done
@@ -221,7 +232,7 @@ if (( $last + $interval < $now )); then
 	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