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 <twerner@debian.org>

diff --git a/daklib/filewriter.py b/daklib/filewriter.py
index 8907fa6d96fa39f7c8e2d7163f3c20e4f361bd2e..de74af6f2117c7fbd68283804053013406f85ba7 100755 (executable)
--- 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)