X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=e746019d0c970fc8723fc674403172496fc457c6;hb=dd80b169287a128cd9e3b833852fbf68106385b5;hp=718dffb158dc73cb5f6dd9d5bada2bd727b68f08;hpb=6012ae32ffeba6fbbd1af9581f88faca190d8cc3;p=dak.git diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index 718dffb1..e746019d 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -28,15 +28,7 @@ Generate Packages/Sources files # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -from daklib.dbconn import * -from daklib.config import Config -from daklib import utils, daklog -from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED -from daklib.filewriter import PackagesFileWriter, SourcesFileWriter - -import apt_pkg, os, stat, sys - -EXIT_STATUS = 0 +import apt_pkg, sys def usage(): print """Usage: dak generate-packages-sources2 [OPTIONS] @@ -99,6 +91,9 @@ s.source, s.version def generate_sources(suite_id, component_id): global _sources_query + from daklib.filewriter import SourcesFileWriter + from daklib.dbconn import Component, DBConn, OverrideType, Suite + from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS session = DBConn().session() dsc_type = session.query(OverrideType).filter_by(overridetype='dsc').one().overridetype_id @@ -121,7 +116,7 @@ def generate_sources(suite_id, component_id): message = ["generate sources", suite.suite_name, component.component_name] session.rollback() - return message + return (PROC_STATUS_SUCCESS, message) ############################################################################# @@ -156,18 +151,27 @@ WITH SELECT (SELECT - STRING_AGG(key || '\: ' || value, E'\n' ORDER BY mk.ordering, mk.key) + STRING_AGG(key || '\: ' || value, E'\n' ORDER BY ordering, key) FROM - binaries_metadata bm - JOIN metadata_keys mk ON mk.key_id = bm.key_id - WHERE - bm.bin_id = tmp.binary_id - AND key != 'Section' AND key != 'Priority' + (SELECT key, ordering, + CASE WHEN :include_long_description = 'false' AND key = 'Description' + THEN SUBSTRING(value FROM E'\\A[^\n]*') + ELSE value + END AS value + FROM + binaries_metadata bm + JOIN metadata_keys mk ON mk.key_id = bm.key_id + WHERE + bm.bin_id = tmp.binary_id + AND key != ALL (:metadata_skip) + ) AS metadata ) || COALESCE(E'\n' || (SELECT STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key) FROM external_overrides eo - WHERE eo.package = tmp.package + WHERE + eo.package = tmp.package + AND eo.suite = :overridesuite AND eo.component = :component ), '') || E'\nSection\: ' || sec.section || E'\nPriority\: ' || pri.priority @@ -194,11 +198,14 @@ WHERE AND o.type = :type_id AND o.suite = :overridesuite AND o.component = :component -ORDER BY tmp.package, tmp.version +ORDER BY tmp.source, tmp.package, tmp.version """ def generate_packages(suite_id, component_id, architecture_id, type_name): global _packages_query + from daklib.filewriter import PackagesFileWriter + from daklib.dbconn import Architecture, Component, DBConn, OverrideType, Suite + from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS session = DBConn().session() arch_all_id = session.query(Architecture).filter_by(arch_string='all').one().arch_id @@ -209,6 +216,15 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): architecture = session.query(Architecture).get(architecture_id) overridesuite_id = suite.get_overridesuite().suite_id + include_long_description = suite.include_long_description + + # We currently filter out the "Tag" line. They are set by external + # overrides and NOT by the maintainer. And actually having it set by + # maintainer means we output it twice at the moment -> which breaks + # dselect. + metadata_skip = ["Section", "Priority", "Tag"] + 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) @@ -216,7 +232,8 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): 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, - "overridesuite": overridesuite_id}) + "overridesuite": overridesuite_id, "metadata_skip": metadata_skip, + "include_long_description": 'true' if include_long_description else 'false'}) for (stanza,) in r: print >>output, stanza print >>output, "" @@ -225,16 +242,76 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): message = ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string] session.rollback() - return message + return (PROC_STATUS_SUCCESS, message) + +############################################################################# + +_translations_query = """ +WITH + override_suite AS + (SELECT + s.id AS id, + COALESCE(os.id, s.id) AS overridesuite_id + FROM suite AS s LEFT JOIN suite AS os ON s.overridesuite = os.suite_name) + +SELECT + 'Package\: ' || b.package + || E'\nDescription-md5\: ' || bm_description_md5.value + || E'\nDescription-en\: ' || bm_description.value + || E'\n' +FROM binaries b + -- join tables for suite and component + JOIN bin_associations ba ON b.id = ba.bin + JOIN override_suite os ON os.id = ba.suite + JOIN override o ON b.package = o.package AND o.suite = os.overridesuite_id AND o.type = (SELECT id FROM override_type WHERE type = 'deb') + + -- join tables for Description and Description-md5 + JOIN binaries_metadata bm_description ON b.id = bm_description.bin_id AND bm_description.key_id = (SELECT key_id FROM metadata_keys WHERE key = 'Description') + JOIN binaries_metadata bm_description_md5 ON b.id = bm_description_md5.bin_id AND bm_description_md5.key_id = (SELECT key_id FROM metadata_keys WHERE key = 'Description-md5') + + -- we want to sort by source name + JOIN source s ON b.source = s.id + +WHERE ba.suite = :suite AND o.component = :component +GROUP BY s.source, b.package, bm_description_md5.value, bm_description.value +ORDER BY s.source, b.package, bm_description_md5.value +""" + +def generate_translations(suite_id, component_id): + global _translations_query + from daklib.filewriter import TranslationFileWriter + from daklib.dbconn import DBConn, Suite, Component + from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS + + session = DBConn().session() + 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") + output = writer.open() + + r = session.execute(_translations_query, {"suite": suite_id, "component": component_id}) + for (stanza,) in r: + print >>output, stanza + + writer.close() + + message = ["generate-translations", suite.suite_name, component.component_name] + session.rollback() + return (PROC_STATUS_SUCCESS, message) ############################################################################# def main(): + from daklib.config import Config + from daklib import daklog + cnf = Config() Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"), ('s',"suite","Generate-Packages-Sources::Options::Suite"), - ('f',"force","Generate-Packages-Sources::Options::Force")] + ('f',"force","Generate-Packages-Sources::Options::Force"), + ('o','option','','ArbItem')] suite_names = apt_pkg.ParseCommandLine(cnf.Cnf, Arguments, sys.argv) try: @@ -245,9 +322,15 @@ def main(): if Options.has_key("Help"): usage() - logger = daklog.Logger(cnf, 'generate-packages-sources2') + from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED + pool = DakProcessPool() + + logger = daklog.Logger('generate-packages-sources2') + from daklib.dbconn import Component, DBConn, get_suite, Suite session = DBConn().session() + session.execute("SELECT add_missing_description_md5()") + session.commit() if Options.has_key("Suite"): suites = [] @@ -275,13 +358,17 @@ def main(): else: logger.log(['E: ', msg]) - pool = DakProcessPool() for s in suites: if s.untouchable and not force: + import utils 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: + pool.apply_async(generate_translations, [s.suite_id, c], callback=parse_results) for a in s.architectures: + if a == 'source': + continue pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=parse_results) pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=parse_results) @@ -293,7 +380,7 @@ def main(): logger.close() - sys.exit(pool.output_status()) + sys.exit(pool.overall_status()) if __name__ == '__main__': main()