From: Torsten Werner Date: Sat, 26 Mar 2011 22:10:33 +0000 (+0100) Subject: Use the newdists dir as temporary output dir for g-p-s2. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52e66eb5d3e82d9647370cb4438cae1040fb5603;p=dak Use the newdists dir as temporary output dir for g-p-s2. It should be changed back after more testing. Signed-off-by: Torsten Werner --- diff --git a/daklib/filewriter.py b/daklib/filewriter.py index 8907fa6d..de74af6f 100755 --- a/daklib/filewriter.py +++ b/daklib/filewriter.py @@ -132,9 +132,13 @@ class PackagesFileWriter(BaseFileWriter): } flags.update(keywords) if flags['debtype'] == 'deb': - template = "dists/%(suite)s/%(component)s/binary-%(architecture)s/Packages" + #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" else: # udeb - template = "dists/%(suite)s/%(component)s/debian-installer/binary-%(architecture)s/Packages" + #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" BaseFileWriter.__init__(self, template, **flags) class SourcesFileWriter(BaseFileWriter): @@ -149,5 +153,7 @@ class SourcesFileWriter(BaseFileWriter): 'bzip2': True } flags.update(keywords) - template = "dists/%(suite)s/%(component)s/source/Sources" + #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" BaseFileWriter.__init__(self, template, **flags)