[dak/master] Switch to 'dak contents generate'.
It replaces APT::FTPArchive::Contents.
Signed-off-by: Torsten Werner <twerner@debian.org>
---
config/debian/dinstall.functions | 3 +--
dak/generate_packages_sources.py | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 635d99c..508e60e 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 fe2a4ed..bdd3180 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))
--
1.7.2.3
Reply to: