From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 14 Dec 2010 18:54:47 +0000 (+0100)
Subject: Fix the arch entries for the buildd suites
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=08521437e47df3ecf7253e99dd10722e31820f38;p=dak.git

Fix the arch entries for the buildd suites

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

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 7bd0e7e6..67b90944 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -25,8 +25,8 @@ apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
 cd  ${base}/buildd
 for dist in $DISTS; do
     rm -f $dist/Release*
-    archs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
-    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $dist security" -o APT::FTPArchive::Release::Architectures="${archs}" release $dist > Release
+    darchs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
+    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $dist security" -o APT::FTPArchive::Release::Architectures="${darchs}" release $dist > Release
     gpg --secret-keyring ${base}/s3kr1t/dot-gnupg/secring.gpg --keyring ${base}/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release
     mv Release* $dist/.
 done
diff --git a/config/debian-security/vars b/config/debian-security/vars
index 9a33dd47..2d040a91 100644
--- a/config/debian-security/vars
+++ b/config/debian-security/vars
@@ -8,7 +8,7 @@ masterdir=$base/dak/
 configdir=$masterdir/config/debian-security/
 webdir=$masterdir/web
 indices=$ftpdir/indices
-archs=$(dak admin a list)
+archs=$(dak admin a list | tr '\n' ' ')
 
 scriptdir=$base/scripts
 scriptsdir=$masterdir/scripts/debian/