Switch to 'dak contents generate'.

[dak.git] / dak / generate_packages_sources.py

diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index 801d219cd699161d664f710873f0adeeda432d72..bdd318056f14d2262b0fcf19c1101996826d3d58 100755 (executable)
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -286,7 +286,7 @@ tree "dists/proposed-updates/main"
 };
 """
     apt_trees["oldstable-proposed-updates"]="""
-tree "dists/proposed-updates"
+tree "dists/oldstable-proposed-updates"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
@@ -299,7 +299,7 @@ tree "dists/proposed-updates"
 };
 """
     apt_trees["di"]["oldstable-proposed-updates"]="""
-tree "dists/proposed-updates/main"
+tree "dists/oldstable-proposed-updates/main"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
@@ -338,7 +338,7 @@ tree "dists/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))