X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=wanna-build%2Ftrigger.daily;h=8a1e4c39c35db40b46ecfe9eb7228edd6f697f55;hb=c7894f83ebc004f296a5fd38d91e23f190147614;hp=8d80dbd4797866a745c1deeffd4aa8d411030475;hpb=a28cb5af382c0a7601451f65b90def4ab69021e4;p=dak.git

diff --git a/wanna-build/trigger.daily b/wanna-build/trigger.daily
index 8d80dbd4..8a1e4c39 100755
--- a/wanna-build/trigger.daily
+++ b/wanna-build/trigger.daily
@@ -3,7 +3,11 @@
 # Updates wanna-build databases after the archive maintenance
 # finishes
 #
+# Files:
+#     Sources-* == upstream fetched file
+#     Sources.* == uncompressed, concat'd version
 PATH="/bin:/usr/bin"
+#testing must be before unstable so late upld don't build for testing needlessly
 DISTS="oldstable-security stable stable-security testing testing-security unstable"
 SECTIONS="main contrib non-free"
 ARCHS_oldstable="m68k arm sparc alpha powerpc i386"
@@ -17,19 +21,24 @@ LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
 
 DAY=`date +%w`
 
+if lockfile -! -l 3600 $LOCKFILE; then
+	echo "Cannot lock $LOCKFILE"
+	exit 1
+fi
+
+cleanup() {
+	rm -f "$LOCKFILE"
+}
+trap cleanup 0
+
 echo Updating wanna-build databases...
-umask 022
+umask 027
 
 if [ "$DAY" = "0" ]; then
 	savelog -c 26 -p /org/wanna-build/db/merge.log
 fi
 
 exec >> /org/wanna-build/db/merge.log 2>&1
-lockfile -l 3600 $LOCKFILE
-cleanup() {
-	rm -f "$LOCKFILE"
-}
-trap cleanup 0
 
 echo -------------------------------------------------------------------------
 echo "merge triggered `date`"
@@ -67,7 +76,6 @@ for d in $DISTS ; do
 		fi
 	done
 
-
 	for s in $SECTIONS ; do
 		if echo $d | grep -qv -- -security; then
 			rm -f Sources.gz
@@ -120,7 +128,7 @@ for d in $DISTS ; do
 				fi
 				gzip -dc Sources-$d.accepted.gz >> Sources.$d
 				if curl $CURLOPT http://security.debian.org/buildd/$dist/Packages.gz -o Packages.gz; then
-					mv Packages.gz Packages-$d.accepted.gz
+					mv Packages.gz Packages.$d.accepted.gz
 				fi
 			fi
 			rm -f Packages.gz
@@ -156,7 +164,11 @@ for d in $DISTS ; do
 		done
 	fi
 	for a in $ARCHS ; do
-		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
+		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-old >> quinn-$d.$a
+		fi
 	done
 done
 
@@ -167,6 +179,11 @@ 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
@@ -201,8 +218,8 @@ for d in $DISTS; do
 done
 
 echo "merge ended `date`"
-rm -f "$LOCKFILE"
-trap -
 /org/wanna-build/bin/wb-graph >> /org/wanna-build/etc/graph-data
 /org/wanna-build/bin/wb-graph -p >> /org/wanna-build/etc/graph2-data
+rm -f "$LOCKFILE"
+trap -
 /org/buildd.debian.org/bin/makegraph