Merge remote branch 'ftpmaster/master'

[dak.git] / daklib / filewriter.py

diff --git a/daklib/filewriter.py b/daklib/filewriter.py
index de74af6f2117c7fbd68283804053013406f85ba7..b44fc2a5775c0fac1e21cb56af3585c6691a31ab 100755 (executable)
--- a/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@ -74,11 +74,11 @@ class BaseFileWriter(object):
         '''
         self.file.close()
         if self.gzip:
-            check_call('gzip --rsyncable <%s.new >%s.gz.new' % (self.path, self.path),
+            check_call('gzip -9cn --rsyncable <%s.new >%s.gz.new' % (self.path, self.path),
                 shell = True)
             self.rename('%s.gz' % self.path)
         if self.bzip2:
-            check_call('bzip2 <%s.new >%s.bz2.new' % (self.path, self.path), shell = True)
+            check_call('bzip2 -9 <%s.new >%s.bz2.new' % (self.path, self.path), shell = True)
             self.rename('%s.bz2' % self.path)
         if self.uncompressed:
             self.rename(self.path)
@@ -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)