From: Mark Hymers <mhy@debian.org>
Date: Sat, 26 Mar 2011 22:12:02 +0000 (+0000)
Subject: Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0054e47869fff84e927e7e29871860f9647cccac;hp=4153c07a225e72f59e103c452749dae5d21af2b4;p=dak.git

Merge branch 'master' of ssh://ftp-master.debian.org/srv/ftp.debian.org/git/dak
---

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)