X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Ffilewriter.py;h=8907fa6d96fa39f7c8e2d7163f3c20e4f361bd2e;hb=8cc3abc9bfb1145151bacc92ba253df255401e6b;hp=de74af6f2117c7fbd68283804053013406f85ba7;hpb=52e66eb5d3e82d9647370cb4438cae1040fb5603;p=dak.git

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)