From 190333466b6e57c4cfaa57c1e22ae366ce9d9dad Mon Sep 17 00:00:00 2001 From: Ansgar Burchardt Date: Sun, 19 Feb 2012 14:06:04 +0000 Subject: [PATCH] Pass compression methods to FileWriter. --- dak/generate_packages_sources2.py | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index f0e08654..8b4773d8 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -103,7 +103,13 @@ def generate_sources(suite_id, component_id): overridesuite_id = suite.get_overridesuite().suite_id - writer = SourcesFileWriter(suite=suite.suite_name, component=component.component_name) + writer_args = { + '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 @@ -226,8 +232,15 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): if include_long_description: metadata_skip.append("Description-md5") - writer = PackagesFileWriter(suite=suite.suite_name, component=component.component_name, - architecture=architecture.arch_string, debtype=type_name) + writer_args = { + '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, @@ -287,7 +300,14 @@ def generate_translations(suite_id, component_id): suite = session.query(Suite).get(suite_id) component = session.query(Component).get(component_id) - writer = TranslationFileWriter(suite=suite.suite_name, component=component.component_name, language="en") + writer_args = { + '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}) -- 2.39.2