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

diff --git a/bin/wanna-build-statistics b/bin/wanna-build-statistics
index 0b059118dc0d2664555ff9b0978077bae0ecf971..e828121266d061bee7bf07200b2dc016ec5399c9 100755 (executable)
--- a/bin/wanna-build-statistics
+++ b/bin/wanna-build-statistics
@@ -102,7 +102,7 @@ print "--------------", "-" x length($dist), "\n";
 
 my $total_width = 78;
 my @state_list = qw(Installed Needs-Build Building Built Build-Attempted Uploaded Failed Dep-Wait
-                                       Failed-Removed Dep-Wait-Removed
+                                       Failed-Removed Dep-Wait-Removed BD-Uninstallable
                                        Not-For-Us);
 my $statewidth = 0;
 grep { $statewidth = length($_) if length($_) > $statewidth } @state_list;
@@ -148,7 +148,7 @@ print percent(qw(Built Installed Uploaded)), " if also counting built pkgs\n";
 print percent(qw(Needs-Build)), " uncompiled\n";
 print percent(qw(Building)), " currently building (short-term delay)\n";
 print percent(qw(Build-Attempted)), " currently failed building (short-term delay)\n";
-print percent(qw(Failed Dep-Wait)), " failed or waiting (long-term delay)\n";
+print percent(qw(Failed BD-Uninstallable Dep-Wait)), " failed or waiting (long-term delay)\n";
 
 exit 0;
 

diff --git a/trigger.daily b/trigger.daily
index c8222958b0bdd0eb0222d470cba0461ec4e1013b..2d4380621918f65aed3f80e4aca71c870354af6f 100755 (executable)
--- a/trigger.daily
+++ b/trigger.daily
@@ -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 @@ 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