print """Usage: dak generate-packages-sources2 [OPTIONS]
Generate the Packages/Sources files
+ -a, --archive=ARCHIVE process suites in ARCHIVE
-s, --suite=SUITE process this suite
Default: All suites not marked 'untouchable'
-f, --force Allow processing of untouchable suites
(SELECT
STRING_AGG(
CASE
- WHEN key = 'Source' THEN 'Package\: '
+ WHEN key = 'Source' THEN E'Package\: '
WHEN key = 'Files' THEN E'Files\:\n ' || f.md5sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
WHEN key = 'Checksums-Sha1' THEN E'Checksums-Sha1\:\n ' || f.sha1sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
WHEN key = 'Checksums-Sha256' THEN E'Checksums-Sha256\:\n ' || f.sha256sum || ' ' || f.size || ' ' || SUBSTRING(f.filename FROM E'/([^/]*)\\Z')
- ELSE key || '\: '
+ ELSE key || E'\: '
END || value, E'\n' ORDER BY mk.ordering, mk.key)
FROM
source_metadata sm
WHERE s.id=sm.src_id
)
||
- E'\nDirectory\: pool/' || SUBSTRING(f.filename FROM E'\\A(.*)/[^/]*\\Z')
+ CASE
+ WHEN src_associations_full.extra_source THEN E'\nExtra-Source-Only\: yes'
+ ELSE ''
+ END
||
- E'\nPriority\: ' || pri.priority
+ E'\nDirectory\: pool/' || :component_name || '/' || SUBSTRING(f.filename FROM E'\\A(.*)/[^/]*\\Z')
||
- E'\nSection\: ' || sec.section
+ E'\nPriority\: ' || COALESCE(pri.priority, 'extra')
+ ||
+ E'\nSection\: ' || COALESCE(sec.section, 'misc')
FROM
source s
-JOIN src_associations sa ON s.id = sa.source
+JOIN src_associations_full ON src_associations_full.suite = :suite AND s.id = src_associations_full.source
JOIN files f ON s.file=f.id
-JOIN override o ON o.package = s.source
-JOIN section sec ON o.section = sec.id
-JOIN priority pri ON o.priority = pri.id
+JOIN files_archive_map fam
+ ON fam.file_id = f.id
+ AND fam.archive_id = (SELECT archive_id FROM suite WHERE id = :suite)
+ AND fam.component_id = :component
+LEFT JOIN override o ON o.package = s.source
+ AND o.suite = :overridesuite
+ AND o.component = :component
+ AND o.type = :dsc_type
+LEFT JOIN section sec ON o.section = sec.id
+LEFT JOIN priority pri ON o.priority = pri.id
WHERE
- sa.suite = :suite
- AND o.suite = :overridesuite AND o.component = :component AND o.type = :dsc_type
+ (src_associations_full.extra_source OR o.suite IS NOT NULL)
ORDER BY
s.source, s.version
overridesuite_id = suite.get_overridesuite().suite_id
- writer = SourcesFileWriter(suite=suite.suite_name, component=component.component_name)
+ writer_args = {
+ 'archive': suite.archive.path,
+ 'suite': suite.suite_name,
+ 'component': component.component_name
+ }
+ if suite.indices_compression is not None:
+ writer_args['compression'] = suite.indices_compression
+ writer = SourcesFileWriter(**writer_args)
output = writer.open()
# run query and write Sources
- r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "dsc_type": dsc_type, "overridesuite": overridesuite_id})
+ r = session.execute(_sources_query, {"suite": suite_id, "component": component_id, "component_name": component.component_name, "dsc_type": dsc_type, "overridesuite": overridesuite_id})
for (stanza,) in r:
print >>output, stanza
print >>output, ""
binaries b
JOIN bin_associations ba ON b.id = ba.bin
JOIN files f ON f.id = b.file
- JOIN location l ON l.id = f.location
+ JOIN files_archive_map fam ON f.id = fam.file_id AND fam.archive_id = :archive_id
JOIN source s ON b.source = s.id
WHERE
(b.architecture = :arch_all OR b.architecture = :arch) AND b.type = :type_name
AND ba.suite = :suite
- AND l.component = :component
+ AND fam.component_id = :component
)
SELECT
(SELECT
- STRING_AGG(key || '\: ' || value, E'\n' ORDER BY mk.ordering, mk.key)
+ STRING_AGG(key || E'\: ' || 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 != ALL (:metadata_skip)
+ (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)
+ STRING_AGG(key || E'\: ' || 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
+ || E'\nFilename\: pool/' || :component_name || '/' || tmp.filename
|| E'\nSize\: ' || tmp.size
|| E'\nMD5sum\: ' || tmp.md5sum
|| E'\nSHA1\: ' || tmp.sha1sum
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 suite.include_long_description:
+ if include_long_description:
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)
+ writer_args = {
+ 'archive': suite.archive.path,
+ 'suite': suite.suite_name,
+ 'component': component.component_name,
+ 'architecture': architecture.arch_string,
+ 'debtype': type_name
+ }
+ if suite.indices_compression is not None:
+ writer_args['compression'] = suite.indices_compression
+ writer = PackagesFileWriter(**writer_args)
output = writer.open()
- r = session.execute(_packages_query, {"suite": suite_id, "component": component_id,
+ r = session.execute(_packages_query, {"archive_id": suite.archive.archive_id,
+ "suite": suite_id, "component": component_id, 'component_name': component.component_name,
"arch": architecture_id, "type_id": type_id, "type_name": type_name, "arch_all": arch_all_id,
- "overridesuite": overridesuite_id, "metadata_skip": metadata_skip})
+ "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, ""
#############################################################################
_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'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 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 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
+GROUP BY b.package, bm_description_md5.value, bm_description.value
+ORDER BY MIN(s.source), b.package, bm_description_md5.value
"""
def generate_translations(suite_id, component_id):
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")
+ writer_args = {
+ 'archive': suite.archive.path,
+ 'suite': suite.suite_name,
+ 'component': component.component_name,
+ 'language': 'en',
+ }
+ if suite.i18n_compression is not None:
+ writer_args['compression'] = suite.i18n_compression
+ writer = TranslationFileWriter(**writer_args)
output = writer.open()
r = session.execute(_translations_query, {"suite": suite_id, "component": component_id})
#############################################################################
def main():
- from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
- pool = DakProcessPool()
-
- from daklib.dbconn import Component, DBConn, get_suite, Suite
from daklib.config import Config
from daklib import daklog
cnf = Config()
Arguments = [('h',"help","Generate-Packages-Sources::Options::Help"),
+ ('a','archive','Generate-Packages-Sources::Options::Archive','HasArg'),
('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)
+ suite_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
try:
- Options = cnf.SubTree("Generate-Packages-Sources::Options")
+ Options = cnf.subtree("Generate-Packages-Sources::Options")
except KeyError:
Options = {}
if Options.has_key("Help"):
usage()
+ 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, Archive
session = DBConn().session()
session.execute("SELECT add_missing_description_md5()")
session.commit()
print "I: Cannot find suite %s" % s
logger.log(['Cannot find suite %s' % s])
else:
- suites = session.query(Suite).filter(Suite.untouchable == False).all()
+ query = session.query(Suite).filter(Suite.untouchable == False)
+ if 'Archive' in Options:
+ query = query.join(Suite.archive).filter(Archive.archive_name==Options['Archive'])
+ suites = query.all()
force = Options.has_key("Force") and Options["Force"]
- component_ids = [ c.component_id for c in session.query(Component).all() ]
def parse_results(message):
# Split out into (code, msg)
else:
logger.log(['E: ', msg])
+ # Lock tables so that nobody can change things underneath us
+ session.execute("LOCK TABLE src_associations IN SHARE MODE")
+ session.execute("LOCK TABLE bin_associations IN SHARE MODE")
+
for s in suites:
+ component_ids = [ c.component_id for c in s.components ]
if s.untouchable and not force:
- utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name)
+ import daklib.utils
+ daklib.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)
- pool.apply_async(generate_translations, [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
projects / dak.git / blobdiff