From: Joerg Jaspert Date: Sat, 7 May 2011 12:51:02 +0000 (+0200) Subject: switch of a-f X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5eec88888cc62587888f6f3cdb06cdb10a609e9;p=dak switch of a-f Signed-off-by: Joerg Jaspert --- diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 45aaf11e..ab1e62ce 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -169,8 +169,8 @@ function mpfm() { function packages() { log "Generating Packages and Sources files" - cd $configdir - dak generate-packages-sources + #cd $configdir + #dak generate-packages-sources dak generate-packages-sources2 dak contents generate } diff --git a/daklib/filewriter.py b/daklib/filewriter.py index de74af6f..8907fa6d 100755 --- a/daklib/filewriter.py +++ b/daklib/filewriter.py @@ -132,13 +132,9 @@ class PackagesFileWriter(BaseFileWriter): } flags.update(keywords) if flags['debtype'] == 'deb': - #TODO: for our initial tests of g-p-s2 we use a different location - #template = "dists/%(suite)s/%(component)s/binary-%(architecture)s/Packages" - template = "../../ftp.debian.org/web/newdists/%(suite)s/%(component)s/binary-%(architecture)s/Packages" + template = "dists/%(suite)s/%(component)s/binary-%(architecture)s/Packages" else: # udeb - #TODO: for our initial tests of g-p-s2 we use a different location - #template = "dists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages" - template = "../../ftp.debian.org/web/newdists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages" + template = "dists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages" BaseFileWriter.__init__(self, template, **flags) class SourcesFileWriter(BaseFileWriter): @@ -153,7 +149,5 @@ class SourcesFileWriter(BaseFileWriter): 'bzip2': True } flags.update(keywords) - #TODO: for our initial tests of g-p-s2 we use a different location - #template = "dists/%(suite)s/%(component)s/source/Sources" - template = "../../ftp.debian.org/web/newdists/%(suite)s/%(component)s/source/Sources" + template = "dists/%(suite)s/%(component)s/source/Sources" BaseFileWriter.__init__(self, template, **flags)