From: Torsten Werner <twerner@debian.org>
Date: Fri, 11 Mar 2011 19:30:22 +0000 (+0100)
Subject: Switch to 'dak contents generate'.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=e5fa0d1e1c0bcc494b1b9ff2b877b217b8561f2e;p=dak.git

Switch to 'dak contents generate'.

It replaces APT::FTPArchive::Contents.

Signed-off-by: Torsten Werner <twerner@debian.org>
---

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 635d99c4..508e60e6 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -209,8 +209,7 @@ function packages() {
     cd $configdir
     #apt-ftparchive generate apt.conf
     dak generate-packages-sources
-    #TEST: try experimental
-    dak contents -s experimental generate
+    dak contents generate
 }
 
 function pdiff() {
diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index fe2a4ed5..bdd31805 100755
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -338,7 +338,7 @@ tree "dists/oldstable-proposed-updates/main"
         # it has errormessages we like to see
         os.environ['GZIP'] = '--rsyncable'
         os.chdir(tmppath)
-        (result, output) = commands.getstatusoutput('apt-ftparchive generate %s' % os.path.basename(ac_name))
+        (result, output) = commands.getstatusoutput('apt-ftparchive -o APT::FTPArchive::Contents=off generate %s' % os.path.basename(ac_name))
         sn="a-f %s,%s: " % (suite, arch)
         print sn + output.replace('\n', '\n%s' % (sn))