From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 8 Aug 2008 12:24:41 +0000 (+0000)
Subject: Gah, apt is a piece of shit. Well, it expects the uncompressed
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9247d27a07634e8bb8ed47ed5d5da7bcef279fcc;p=dak.git

Gah, apt is a piece of shit. Well, it expects the uncompressed
Packages files in the Release file to appear, so lets generate them.
Also make sure we dont have empty release files listed...
---

diff --git a/config/debian/apt.conf.buildd b/config/debian/apt.conf.buildd
index 2ad4483c..65a8363e 100644
--- a/config/debian/apt.conf.buildd
+++ b/config/debian/apt.conf.buildd
@@ -7,8 +7,8 @@ Dir
 
 Default
 {
-   Packages::Compress "bzip2 gzip";
-   Sources::Compress "bzip2 gzip";
+   Packages::Compress ". bzip2 gzip";
+   Sources::Compress ". bzip2 gzip";
    DeLinkLimit 0;
    FileMode 0664;
 }
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index f17331df..406636ef 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -52,10 +52,11 @@ if lockfile -r3 $LOCKFILE; then
 	    cd $configdir
 	    apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
 
-	    cd  ${incoming}/buildd
-	    rm -f 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 . > Release
+	    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}