X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trigger.often;h=89e51efc65d54c6aaba77068aef5ea4d0f605661;hb=cca37a9962eb5b52b4590e4bccf390512202a47d;hp=eff43724fcab70f0982096ae30728a1426dd5929;hpb=53e031de24ea63ceaf5d37c336566663452c9323;p=wannabuild.git

diff --git a/trigger.often b/trigger.often
index eff4372..89e51ef 100755
--- a/trigger.often
+++ b/trigger.often
@@ -7,10 +7,9 @@
 #     Sources-* == upstream fetched file
 #     Sources.* == uncompressed, concat'd version
 #
-# RM: disabled for etch release
 
 LANG=C
-PATH="/bin:/usr/bin"
+PATH="/bin:/usr/bin:/org/wanna-build/bin/"
 TMPDIR="/org/wanna-build/tmp"
 LIBTRIGGER="/org/wanna-build/libtrigger.sh"
 WGETOPT="-q -t2 -w0 -T10"
@@ -44,24 +43,26 @@ cd $TMPDIR
 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
+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_unstable ; do
 	if [ "$a" = "$NEWARCH" ]; then
-		quinn-diff -i -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
+		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
-		quinn-diff -i -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
+		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