X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fgenerate_packages_sources2.py;h=46cb78387a7dee12f0c8de6e3cbae9e2996c3c14;hb=a0c908d444533046da008d9d844224185a738c07;hp=3b28c53bde798257baccdea6e226ca01537656e7;hpb=1149b8e288d45a56c61b7d3804e25fd33de4f27a;p=dak.git diff --git a/dak/generate_packages_sources2.py b/dak/generate_packages_sources2.py index 3b28c53b..46cb7838 100755 --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@ -28,11 +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 Pool -import apt_pkg, os, stat, sys +import apt_pkg, sys def usage(): print """Usage: dak generate-packages-sources2 [OPTIONS] @@ -42,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. @@ -87,31 +88,17 @@ 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 + 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 @@ -119,17 +106,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, "" + writer.close() + message = ["generate sources", suite.suite_name, component.component_name] session.rollback() - return message + return (PROC_STATUS_SUCCESS, message) ############################################################################# @@ -170,8 +162,15 @@ 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 != ALL (:metadata_skip) ) + || COALESCE(E'\n' || (SELECT + STRING_AGG(key || '\: ' || value, E'\n' ORDER BY key) + FROM external_overrides eo + WHERE + eo.package = tmp.package + AND eo.suite = :overridesuite AND eo.component = :component + ), '') || E'\nSection\: ' || sec.section || E'\nPriority\: ' || pri.priority || E'\nFilename\: pool/' || tmp.filename @@ -195,33 +194,16 @@ 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 +ORDER BY tmp.source, 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): +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 + from daklib.dakmultiprocessing import PROC_STATUS_SUCCESS session = DBConn().session() arch_all_id = session.query(Architecture).filter_by(arch_string='all').one().arch_id @@ -231,26 +213,104 @@ 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 + + # 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}) + "arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id, + "overridesuite": overridesuite_id, "metadata_skip": metadata_skip}) for (stanza,) in r: print >>output, stanza print >>output, "" + writer.close() + 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"), + ('5','description-md5',"Generate-Packages-Sources::Options::Description-md5"), ('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: @@ -261,9 +321,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 = [] @@ -277,27 +343,43 @@ 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() ] - def log(details): - logger.log(details) + def parse_results(message): + # Split out into (code, msg) + code, msg = message + if code == PROC_STATUS_SUCCESS: + logger.log([msg]) + elif code == PROC_STATUS_SIGNALRAISED: + logger.log(['E: Subprocess recieved signal ', msg]) + else: + logger.log(['E: ', msg]) - 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) + 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: - pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log) - pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log) + if a == 'source': + continue + 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() + # this script doesn't change the database session.close() + logger.close() + + sys.exit(pool.overall_status()) + if __name__ == '__main__': main()