From: Joerg Jaspert Date: Sun, 4 Sep 2011 13:07:29 +0000 (+0200) Subject: Merge remote-tracking branch 'ansgar/description-md5' into merge X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=df984f92931b276da9e3ddb0b2fb6e7dc05d91d6;hp=e2c4fd7f21c3b33cd7192bded5d6373e0ee90374;p=dak.git Merge remote-tracking branch 'ansgar/description-md5' into merge * ansgar/description-md5: Rename dakdb/update67.py -> dakdb/update69.py generate-packages-sources2: add --description-md5 option Include a trailing newline for the hash. generate-packages-sources2: Add support for Description-md5 Add database support for Description-md5 add TranslationFileWriter Signed-off-by: Joerg Jaspert --- diff --git a/dak/dakdb/update69.py b/dak/dakdb/update69.py new file mode 100755 index 00000000..941a3e99 --- /dev/null +++ b/dak/dakdb/update69.py @@ -0,0 +1,79 @@ +#!/usr/bin/env python +# coding=utf8 + +""" +Add support for Description-md5 + +@contact: Debian FTP Master +@copyright: 2011 Ansgar Burchardt +@license: GNU General Public License version 2 or later +""" + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +################################################################################ + +import psycopg2 +from daklib.dak_exceptions import DBUpdateError +from daklib.config import Config + +################################################################################ +def do_update(self): + """ + Add support for Description-md5 + """ + print __doc__ + try: + cnf = Config() + + c = self.db.cursor() + + c.execute("""CREATE OR REPLACE FUNCTION public.add_missing_description_md5() + RETURNS VOID + VOLATILE + LANGUAGE plpgsql +AS $function$ +DECLARE + description_key_id metadata_keys.key_id%TYPE; + description_md5_key_id metadata_keys.key_id%TYPE; + BEGIN + SELECT key_id INTO STRICT description_key_id FROM metadata_keys WHERE key='Description'; + SELECT key_id INTO description_md5_key_id FROM metadata_keys WHERE key='Description-md5'; + IF NOT FOUND THEN + INSERT INTO metadata_keys (key) VALUES ('Description-md5') RETURNING key_id INTO description_md5_key_id; + END IF; + + INSERT INTO binaries_metadata + (bin_id, key_id, value) + SELECT + bm.bin_id AS bin_id, + description_md5_key_id AS key_id, + MD5(bm.value || E'\n') AS value + FROM binaries_metadata AS bm + WHERE + bm.key_id = description_key_id + AND + NOT EXISTS (SELECT 1 FROM binaries_metadata AS bm2 WHERE bm.bin_id = bm2.bin_id AND bm2.key_id = description_md5_key_id); +END; +$function$""") + + c.execute("ALTER TABLE suite ADD COLUMN include_long_description BOOLEAN NOT NULL DEFAULT 't'") + + c.execute("UPDATE config SET value = '69' WHERE name = 'db_revision'") + self.db.commit() + + except psycopg2.ProgrammingError, msg: + self.db.rollback() + raise DBUpdateError('Unable to apply sick update 69, rollback issued. Error message : %s' % (str(msg))) diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index d29e0317..c6d4ade9 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -38,6 +38,11 @@ Generate the Packages/Sources files Default: All suites not marked 'untouchable' -f, --force Allow processing of untouchable suites CAREFUL: Only to be used at point release time! + -5, --description-md5 Allow to use Description-md5 instead of + Description for Packages index and generate + Translation-en + NOTE: suite.include_long_descriptions needs to + be set to false for this. -h, --help show this help and exit SUITE can be a space seperated list, e.g. @@ -120,9 +125,6 @@ def generate_sources(suite_id, component_id): ############################################################################# -# 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. # Here be large dragons. _packages_query = R""" WITH @@ -160,7 +162,7 @@ SELECT JOIN metadata_keys mk ON mk.key_id = bm.key_id WHERE bm.bin_id = tmp.binary_id - AND key != 'Section' AND key != 'Priority' AND key != 'Tag' + AND key != ALL (:metadata_skip) ) || COALESCE(E'\n' || (SELECT STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key) @@ -197,7 +199,7 @@ WHERE ORDER BY tmp.source, tmp.package, tmp.version """ -def generate_packages(suite_id, component_id, architecture_id, type_name): +def generate_packages(suite_id, component_id, architecture_id, type_name, use_description_md5): global _packages_query from daklib.filewriter import PackagesFileWriter from daklib.dbconn import Architecture, Component, DBConn, OverrideType, Suite @@ -213,13 +215,23 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): overridesuite_id = suite.get_overridesuite().suite_id + # 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 suite.include_long_description or not use_description_md5: + metadata_skip.append("Description-md5") + else: + metadata_skip.append("Description") + 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, - "overridesuite": overridesuite_id}) + "overridesuite": overridesuite_id, "metadata_skip": metadata_skip}) for (stanza,) in r: print >>output, stanza print >>output, "" @@ -232,6 +244,54 @@ def generate_packages(suite_id, component_id, architecture_id, type_name): ############################################################################# +_translations_query = """ +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 o ON b.package = o.package AND o.suite = :suite 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.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED pool = DakProcessPool() @@ -243,6 +303,7 @@ def main(): cnf = Config() Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"), + ('5','description-md5',"Generate-Packages-Sources::Options::Description-md5"), ('s',"suite","Generate-Packages-Sources::Options::Suite"), ('f',"force","Generate-Packages-Sources::Options::Force")] @@ -258,6 +319,8 @@ def main(): logger = daklog.Logger('generate-packages-sources2') session = DBConn().session() + session.execute("SELECT add_missing_description_md5()") + session.commit() if Options.has_key("Suite"): suites = [] @@ -271,6 +334,7 @@ def main(): else: suites = session.query(Suite).filter(Suite.untouchable == False).all() + use_description_md5 = Options.has_key("Description-md5") and Options["Description-md5"] force = Options.has_key("Force") and Options["Force"] component_ids = [ c.component_id for c in session.query(Component).all() ] @@ -290,11 +354,13 @@ def main(): 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 use_description_md5 and 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) + pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb', use_description_md5], callback=parse_results) + pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb', use_description_md5], callback=parse_results) pool.close() pool.join() diff --git a/dak/update_db.py b/dak/update_db.py index e3dd0625..e9426ff5 100755 --- a/dak/update_db.py +++ b/dak/update_db.py @@ -46,7 +46,7 @@ from daklib.daklog import Logger ################################################################################ Cnf = None -required_database_schema = 68 +required_database_schema = 69 ################################################################################ diff --git a/daklib/filewriter.py b/daklib/filewriter.py index 274ef5c1..8e17efdf 100755 --- a/daklib/filewriter.py +++ b/daklib/filewriter.py @@ -151,3 +151,19 @@ class SourcesFileWriter(BaseFileWriter): flags.update(keywords) template = "dists/%(suite)s/%(component)s/source/Sources" BaseFileWriter.__init__(self, template, **flags) + +class TranslationFileWriter(BaseFileWriter): + def __init__(self, **keywords): + ''' + The value of the keywords suite, component and language are strings. + Output files are bzip2 compressed only. + ''' + flags = { + 'uncompressed': False, + 'gzip': False, + 'bzip2': True, + 'language': 'en', + } + flags.update(keywords) + template = "dists/%(suite)s/%(component)s/i18n/Translation-%(language)s" + super(TranslationFileWriter, self).__init__(template, **flags)