From: Mark Hymers <mhy@debian.org>
Date: Wed, 4 Nov 2009 19:04:09 +0000 (+0000)
Subject: use manage-build-queues
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=fa61e804d27f286dd5ad60f9212495a5972916f0;p=dak.git

use manage-build-queues

Signed-off-by: Mark Hymers <mhy@debian.org>
---

diff --git a/config/debian/common b/config/debian/common
index 7cd759a9..4a0d6cb9 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -27,20 +27,13 @@ function debug () {
 
 # 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
+    dak manage-build-queues -v 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 55BE302B --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
+    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
 }
 
 # Do the unchecked processing, in case we have files.