No reason to lock the database anymore.

[wannabuild.git] / trigger.daily

diff --git a/trigger.daily b/trigger.daily
index db967a86261b7998b30a6b4105a44297425256ef..1ee7824dd44ba487915e26d93d1cbab5fad5a4cc 100755 (executable)
--- 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
@@ -164,8 +170,6 @@ umask 002
 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
                dist=`echo $d | sed s/-.*$//`
                case "$dist" in
@@ -203,9 +207,8 @@ for a in $ALL_ARCHES ; 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
 umask 022
 for d in $DISTS; do
@@ -226,7 +229,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