From: Ansgar Burchardt <ansgar@debian.org>
Date: Sun, 27 Oct 2013 15:20:41 +0000 (+0100)
Subject: Merge branch 'pu/xz-for-indices'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1eeb90f6bf381e10fcd8f0a04437883b443855d5;p=dak.git

Merge branch 'pu/xz-for-indices'

Conflicts:
	dak/generate_packages_sources2.py
	daklib/filewriter.py
---

1eeb90f6bf381e10fcd8f0a04437883b443855d5
diff --cc dak/generate_packages_sources2.py
index 3b58217a,8b4773d8..7eca3c8c
--- a/dak/generate_packages_sources2.py
+++ b/dak/generate_packages_sources2.py
@@@ -115,7 -103,13 +115,14 @@@ def generate_sources(suite_id, componen
  
      overridesuite_id = suite.get_overridesuite().suite_id
  
-     writer = SourcesFileWriter(archive=suite.archive.path, suite=suite.suite_name, component=component.component_name)
+     writer_args = {
++            'archive': suite.archive.path,
+             'suite': suite.suite_name,
+             'component': component.component_name
+     }
+     if suite.indices_compression is not None:
+         writer_args['compression'] = suite.indices_compression
+     writer = SourcesFileWriter(**writer_args)
      output = writer.open()
  
      # run query and write Sources
@@@ -238,13 -232,18 +245,20 @@@ def generate_packages(suite_id, compone
      if include_long_description:
          metadata_skip.append("Description-md5")
  
-     writer = PackagesFileWriter(archive=suite.archive.path, suite=suite.suite_name,
-             component=component.component_name,
-             architecture=architecture.arch_string, debtype=type_name)
+     writer_args = {
++            'archive': suite.archive.path,
+             'suite': suite.suite_name,
+             'component': component.component_name,
+             'architecture': architecture.arch_string,
+             'debtype': type_name
+     }
+     if suite.indices_compression is not None:
+         writer_args['compression'] = suite.indices_compression
+     writer = PackagesFileWriter(**writer_args)
      output = writer.open()
  
 -    r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
 +    r = session.execute(_packages_query, {"archive_id": suite.archive.archive_id,
 +        "suite": suite_id, "component": component_id, 'component_name': component.component_name,
          "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id,
          "overridesuite": overridesuite_id, "metadata_skip": metadata_skip,
          "include_long_description": 'true' if include_long_description else 'false'})
@@@ -301,7 -300,14 +315,15 @@@ def generate_translations(suite_id, com
      suite = session.query(Suite).get(suite_id)
      component = session.query(Component).get(component_id)
  
-     writer = TranslationFileWriter(archive=suite.archive.path, suite=suite.suite_name, component=component.component_name, language="en")
+     writer_args = {
++            'archive': suite.archive.path,
+             'suite': suite.suite_name,
+             'component': component.component_name,
+             'language': 'en',
+     }
+     if suite.i18n_compression is not None:
+         writer_args['compression'] = suite.i18n_compression
+     writer = TranslationFileWriter(**writer_args)
      output = writer.open()
  
      r = session.execute(_translations_query, {"suite": suite_id, "component": component_id})
diff --cc daklib/filewriter.py
index 148dd171,3b816ee9..2f080e68
mode 100644,100755..100644
--- a/daklib/filewriter.py
+++ b/daklib/filewriter.py
@@@ -47,7 -47,10 +47,8 @@@ class BaseFileWriter(object)
          self.uncompressed = 'none' in compression
          self.gzip = 'gzip' in compression
          self.bzip2 = 'bzip2' in compression
+         self.xz = 'xz' in compression
 -        root_dir = Config()['Dir::Root']
 -        relative_dir = template % keywords
 -        self.path = os.path.join(root_dir, relative_dir)
 +        self.path = template % keywords
  
      def open(self):
          '''