X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=eea799f5b38c7e20f062d1a82ce913527b5b42a2;hb=3be5bc9fca7a4721d0f60563bf2545541c685adb;hp=8d8a8aefa3f2d51103a6324480726c3101d2e6ee;hpb=03752f74fb17550b34678380321e2f37e64acb65;p=dak.git diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index 8d8a8aef..eea799f5 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -31,7 +31,9 @@ Generate Packages/Sources files from daklib.dbconn import * from daklib.config import Config from daklib import utils, daklog -from multiprocessing import Pool +from daklib.dakmultiprocessing import Pool +from daklib.filewriter import PackagesFileWriter, SourcesFileWriter + import apt_pkg, os, stat, sys def usage(): @@ -87,29 +89,12 @@ JOIN priority pri ON o.priority = pri.id WHERE sa.suite = :suite - AND o.suite = :suite AND o.component = :component AND o.type = :dsc_type + AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type ORDER BY s.source, s.version """ -def open_sources(suite, component): - cnf = Config() - dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'source', 'Sources') - - # create queue if it does not exist yet - if os.path.exists(dest) and os.path.isdir(dest): - dest_dir = dest - else: - dest_dir = os.path.dirname(dest) - if not os.path.exists(dest_dir): - umask = os.umask(00000) - os.makedirs(dest_dir, 02775) - os.umask(umask) - - f = open(dest, 'w') - return f - def generate_sources(suite_id, component_id): global _sources_query @@ -119,15 +104,22 @@ def generate_sources(suite_id, component_id): suite = session.query(Suite).get(suite_id) component = session.query(Component).get(component_id) - output = open_sources(suite, component) + overridesuite_id = suite.get_overridesuite().suite_id + + writer = SourcesFileWriter(suite=suite.suite_name, component=component.component_name) + output = writer.open() # run query and write Sources - r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type}) + r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type, "overridesuite": overridesuite_id}) for (stanza,) in r: print >>output, stanza print >>output, "" - return ["generate sources", suite.suite_name, component.component_name] + writer.close() + + message = ["generate sources", suite.suite_name, component.component_name] + session.rollback() + return message ############################################################################# @@ -170,6 +162,11 @@ SELECT bm.bin_id = tmp.binary_id AND key != 'Section' AND key != 'Priority' ) + || COALESCE(E'\n' || (SELECT + STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key) + FROM external_overrides eo + WHERE eo.package = tmp.package + ), '') || E'\nSection\: ' || sec.section || E'\nPriority\: ' || pri.priority || E'\nFilename\: pool/' || tmp.filename @@ -193,31 +190,11 @@ WHERE (architecture = :arch_all AND source NOT IN (SELECT DISTINCT source FROM tmp WHERE architecture <> :arch_all)) ) AND - o.type = :type_id AND o.suite = :suite AND o.component = :component + o.type = :type_id AND o.suite = :overridesuite AND o.component = :component ORDER BY tmp.package, tmp.version """ -def open_packages(suite, component, architecture, type_name): - cnf = Config() - if type_name == 'udeb': - dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'debian-installer', 'binary-%s' % architecture.arch_string, 'Packages') - else: - dest = os.path.join(cnf['Dir::Root'], 'dists', suite.suite_name, component.component_name, 'binary-%s' % architecture.arch_string, 'Packages') - - # create queue if it does not exist yet - if os.path.exists(dest) and os.path.isdir(dest): - dest_dir = dest - else: - dest_dir = os.path.dirname(dest) - if not os.path.exists(dest_dir): - umask = os.umask(00000) - os.makedirs(dest_dir, 02775) - os.umask(umask) - - f = open(dest, 'w') - return f - def generate_packages(suite_id, component_id, architecture_id, type_name): global _packages_query @@ -229,17 +206,24 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): component = session.query(Component).get(component_id) architecture = session.query(Architecture).get(architecture_id) - output = open_packages(suite, component, architecture, type_name) + overridesuite_id = suite.get_overridesuite().suite_id + + writer = PackagesFileWriter(suite=suite.suite_name, component=component.component_name, + architecture=architecture.arch_string, debtype=type_name) + output = writer.open() r = session.execute(_packages_query, {"suite": suite_id, "component": component_id, - "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id}) + "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id, + "overridesuite": overridesuite_id}) for (stanza,) in r: print >>output, stanza print >>output, "" - session.close() + writer.close() - return ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string] + message = ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string] + session.rollback() + return message ############################################################################# @@ -282,21 +266,25 @@ def main(): def log(details): logger.log(details) - pool = Pool() + #pool = Pool() for s in suites: if s.untouchable and not force: 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=log) + logger.log(generate_sources(s.suite_id, c)) + #pool.apply_async(generate_sources, [s.suite_id, c], callback=log) for a in s.architectures: + logger.log(generate_packages(s.suite_id, c, a.arch_id, 'deb')) #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log) - apply(generate_packages, [s.suite_id, c, a.arch_id, 'deb']) + logger.log(generate_packages(s.suite_id, c, a.arch_id, 'udeb')) #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log) - pool.close() - pool.join() + #pool.close() + #pool.join() # this script doesn't change the database session.close() + logger.close() + if __name__ == '__main__': main()