message = ["generate sources", suite.suite_name, component.component_name]
session.rollback()
- return message
+ return (PROC_STATUS_SUCCESS, message)
#############################################################################
+# 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 != 'Section' AND key != 'Priority' AND key != 'Tag'
)
|| 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
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):
message = ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string]
session.rollback()
- return message
+ return (PROC_STATUS_SUCCESS, message)
#############################################################################
for c in component_ids:
pool.apply_async(generate_sources, [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)
logger.close()
- sys.exit(pool.output_status())
+ sys.exit(pool.overall_status())
if __name__ == '__main__':
main()