X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=f3181fd45e1c5200a77598542f36bec3b94919cc;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hp=f709e806f3492f0b8caae6d9352c02d6bb066db5;hpb=058d7d213729fa48a46bf5a74bb681f3e9de5550;p=dak.git diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index f709e806..f3181fd4 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -34,6 +34,7 @@ def usage(): print """Usage: dak generate-packages-sources2 [OPTIONS] Generate the Packages/Sources files + -a, --archive=ARCHIVE process suites in ARCHIVE -s, --suite=SUITE process this suite Default: All suites not marked 'untouchable' -f, --force Allow processing of untouchable suites @@ -66,24 +67,35 @@ SELECT WHERE s.id=sm.src_id ) || + CASE + WHEN src_associations_full.extra_source THEN E'\nExtra-Source-Only\: yes' + ELSE '' + END + || E'\nDirectory\: pool/' || :component_name || '/' || SUBSTRING(f.filename FROM E'\\A(.*)/[^/]*\\Z') || - E'\nPriority\: ' || pri.priority + E'\nPriority\: ' || COALESCE(pri.priority, 'extra') || - E'\nSection\: ' || sec.section + E'\nSection\: ' || COALESCE(sec.section, 'misc') FROM source s -JOIN src_associations sa ON s.id = sa.source +JOIN src_associations_full ON src_associations_full.suite = :suite AND s.id = src_associations_full.source JOIN files f ON s.file=f.id -JOIN override o ON o.package = s.source -JOIN section sec ON o.section = sec.id -JOIN priority pri ON o.priority = pri.id +JOIN files_archive_map fam + ON fam.file_id = f.id + AND fam.archive_id = (SELECT archive_id FROM suite WHERE id = :suite) + AND fam.component_id = :component +LEFT JOIN override o ON o.package = s.source + AND o.suite = :overridesuite + AND o.component = :component + AND o.type = :dsc_type +LEFT JOIN section sec ON o.section = sec.id +LEFT JOIN priority pri ON o.priority = pri.id WHERE - sa.suite = :suite - AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type + (src_associations_full.extra_source OR o.suite IS NOT NULL) ORDER BY s.source, s.version @@ -103,7 +115,14 @@ def generate_sources(suite_id, component_id): 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 @@ -226,9 +245,16 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): 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, {"archive_id": suite.archive.archive_id, @@ -289,7 +315,15 @@ def generate_translations(suite_id, component_id): 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}) @@ -311,6 +345,7 @@ def main(): cnf = Config() Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"), + ('a','archive','Generate-Packages-Sources::Options::Archive','HasArg'), ('s',"suite","Generate-Packages-Sources::Options::Suite"), ('f',"force","Generate-Packages-Sources::Options::Force"), ('o','option','','ArbItem')] @@ -329,7 +364,7 @@ def main(): logger = daklog.Logger('generate-packages-sources2') - from daklib.dbconn import Component, DBConn, get_suite, Suite + from daklib.dbconn import Component, DBConn, get_suite, Suite, Archive session = DBConn().session() session.execute("SELECT add_missing_description_md5()") session.commit() @@ -344,11 +379,13 @@ def main(): print "I: Cannot find suite %s" % s logger.log(['Cannot find suite %s' % s]) else: - suites = session.query(Suite).filter(Suite.untouchable == False).all() + query = session.query(Suite).filter(Suite.untouchable == False) + if 'Archive' in Options: + query = query.join(Suite.archive).filter(Archive.archive_name==Options['Archive']) + suites = query.all() force = Options.has_key("Force") and Options["Force"] - component_ids = [ c.component_id for c in session.query(Component).all() ] def parse_results(message): # Split out into (code, msg) @@ -360,10 +397,15 @@ def main(): else: logger.log(['E: ', msg]) + # Lock tables so that nobody can change things underneath us + session.execute("LOCK TABLE src_associations IN SHARE MODE") + session.execute("LOCK TABLE bin_associations IN SHARE MODE") + for s in suites: + component_ids = [ c.component_id for c in s.components ] if s.untouchable and not force: - import utils - utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name) + import daklib.utils + daklib.utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name) for c in component_ids: pool.apply_async(generate_sources, [s.suite_id, c], callback=parse_results) if not s.include_long_description: