From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 6 Apr 2009 20:47:45 +0000 (+0200)
Subject: signed buildd incoming dir
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=459c6eaf4425915f363530216cd239fe9d8d0f9d;p=dak.git

signed buildd incoming dir

moved all the code creating this into the common file, new function
cron.unchecked now just calls this function (and so sources the common file)
cron.dinstall also calls this function, immediately after process-accepted did run.
This should get the times where buildds get 403 on files down to at max. the runtime
of process-accepted.

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/config/debian/common b/config/debian/common
index ad10ea6c..3655d9d2 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -24,3 +24,21 @@ function debug () {
         log "$*"
     fi
 }
+
+# used by cron.dinstall *and* cron.unchecked.
+function make_buildd_dir () {
+	cd $configdir
+	apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+
+	cd  ${incoming}
+	rm -f buildd/Release*
+	apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release
+	gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o Release.gpg Release
+	mv Release* buildd/.
+
+	cd ${incoming}
+	mkdir -p tree/${STAMP}
+	cp -al ${incoming}/buildd/. tree/${STAMP}/
+	ln -sfT tree/${STAMP} ${incoming}/builddweb
+	find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+}
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 2e84dae1..d5776af1 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -235,6 +235,12 @@ function buildd() {
     apt-ftparchive generate apt.conf.buildd
 }
 
+function buildd_dir() {
+    # Rebuilt the buildd dir to avoid long times of 403
+    log "Regenerating the buildd incoming dir"
+    make_buildd_dir
+}
+
 function scripts() {
     log "Running various scripts from $scriptsdir"
     cd $scriptsdir
@@ -585,6 +591,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="buildd_dir"
+    TIME="buildd_dir"
+    ARGS=""
+    ERR="false"
+)
+stage $GO
+
 GO=(
     FUNC="cruft"
     TIME="cruft"
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 5e7a035d..d41d573d 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -5,6 +5,9 @@ set -u
 export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
 . $SCRIPTVARS
 
+# common functions are "outsourced"
+. "${configdir}/common"
+
 LOCKDAILY=""
 LOCKFILE="$lockdir/unchecked.lock"
 NOTICE="$lockdir/daily.lock"
@@ -56,20 +59,7 @@ if lockfile -r3 $LOCKFILE; then
 		    cat override.sid.$i.src >> override.sid.all3.src
 		fi
 	    done
-	    cd $configdir
-	    apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
-
-	    cd  ${incoming}
-	    rm -f buildd/Release*
-	    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release
-	    gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o Release.gpg Release 
-		mv Release* buildd/.
-
-	    cd ${incoming}
-	    mkdir -p tree/${STAMP}
-	    cp -al ${incoming}/buildd/. tree/${STAMP}/
-	    ln -sfT tree/${STAMP} ${incoming}/builddweb
-	    find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
+        make_buildd_dir
 
 	    . $configdir/cron.buildd
 	fi