--- /dev/null
+#!/usr/bin/env python
+# coding=utf8
+
+"""
+Add support for Description-md5
+
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2011 Ansgar Burchardt <ansgar@debian.org>
+@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)))
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.
#############################################################################
-# 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
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)
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
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, ""
#############################################################################
+_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()
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")]
logger = daklog.Logger('generate-packages-sources2')
session = DBConn().session()
+ session.execute("SELECT add_missing_description_md5()")
+ session.commit()
if Options.has_key("Suite"):
suites = []
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() ]
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()
projects / dak.git / commitdiff