X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trigger.often;h=89e51efc65d54c6aaba77068aef5ea4d0f605661;hb=e810b1094fa8c0f9fc4846d4121d079099b851a7;hp=0821c80fdd16a1a62582dcb952455c962a000bb7;hpb=8143c2593c2537b222e3bde7ee2685286c992a87;p=wannabuild.git

diff --git a/trigger.often b/trigger.often
index 0821c80..89e51ef 100755
--- a/trigger.often
+++ b/trigger.often
@@ -7,16 +7,17 @@
 #     Sources-* == upstream fetched file
 #     Sources.* == uncompressed, concat'd version
 #
-# RM: disabled for etch release
 
 LANG=C
-PATH="/bin:/usr/bin"
-ARCHS="m68k arm armel sparc alpha powerpc i386 mips mipsel ia64 hppa s390 amd64"
+PATH="/bin:/usr/bin:/org/wanna-build/bin/"
 TMPDIR="/org/wanna-build/tmp"
+LIBTRIGGER="/org/wanna-build/libtrigger.sh"
 WGETOPT="-q -t2 -w0 -T10"
 LOCKFILE="/org/wanna-build/tmp/DB_Maintenance_In_Progress"
 NEWARCH=""
 
+. "$LIBTRIGGER"
+
 if lockfile -! -l 3600 $LOCKFILE; then
 	echo "Cannot lock $LOCKFILE"
 	exit 1
@@ -36,43 +37,32 @@ echo "incoming merge triggered: `date`"
 
 cd $TMPDIR
 
-rm -rf srcdep
-umask 022
-cvs -d :pserver:anonymous@cvs.debian.org:/cvs/dak checkout srcdep/Packages-arch-specific >/dev/null
-if [ -f srcdep/Packages-arch-specific ]; then
-	cp -p srcdep/Packages-arch-specific /org/buildd.debian.org/web/quinn-diff/
-fi
-rm -rf srcdep
-umask 027
-
 #
 # Make one big Packages and Sources file from accepted autobuilding.
 #
 rm -f Sources.unstable Sources.gz Packages.gz
 if wget $WGETOPT http://incoming.debian.org/buildd/Sources.gz; then
 	mv Sources.gz Sources-unstable.accepted.gz
+	rm -f Sources-unstable.accepted
+	gunzip Sources-unstable.accepted.gz
 fi
 if wget $WGETOPT http://incoming.debian.org/buildd/Packages.gz; then
 	mv Packages.gz Packages-unstable.accepted.gz
+	rm -f Packages-unstable.accepted
+	gunzip Packages-unstable.accepted.gz
 fi
-cp Sources.unstable.base Sources.unstable
-zcat Sources-unstable.accepted.gz >> Sources.unstable
-for a in $ARCHS; do
+keep-latest source Sources.unstable.base Sources-unstable.accepted > Sources.unstable
+for a in $ARCHS_unstable; do
 	rm -f Packages.unstable.$a
-	cp Packages.unstable.$a.base Packages.unstable.$a
-	zcat Packages-unstable.accepted.gz >> Packages.unstable.$a
+	keep-latest $a Packages.unstable.$a.base Packages-unstable.accepted > Packages.unstable.$a
 done
 	
 umask 007
-for a in $ARCHS ; do
-	if [ "$a" = "i386" ]; then
-		quinn-diff -i -D 177 -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.unstable -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
+for a in $ARCHS_unstable ; do
+	if [ "$a" = "$NEWARCH" ]; then
+		quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable.$NEWARCH -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
 	else
-		if [ "$a" = "$NEWARCH" ]; then
-			quinn-diff -i -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.unstable.$NEWARCH -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
-		else
-			quinn-diff -i -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.unstable -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
-		fi
+		quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/sid/Packages-arch-specific -s Sources.unstable -p Packages.unstable.$a >> quinn-unstable.$a 2> /dev/null
 	fi
 	perl -pi -e 's#^(non-free)/.*$##msg' quinn-unstable.$a
 	if [ "$a" = "$NEWARCH" ]; then