# 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
-from daklib.filewriter import PackagesFileWriter, SourcesFileWriter
-
-import apt_pkg, os, stat, sys
+import apt_pkg, sys
def usage():
print """Usage: dak generate-packages-sources2 [OPTIONS]
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
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):
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
message = ["generate-packages", suite.suite_name, component.component_name, architecture.arch_string]
session.rollback()
- return message
+ return (PROC_STATUS_SUCCESS, message)
#############################################################################
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"),
if Options.has_key("Help"):
usage()
- logger = daklog.Logger(cnf, 'generate-packages-sources2')
+ logger = daklog.Logger('generate-packages-sources2')
session = DBConn().session()
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:
- log(generate_sources(s.suite_id, c))
- #pool.apply_async(generate_sources, [s.suite_id, c], callback=log)
+ pool.apply_async(generate_sources, [s.suite_id, c], callback=parse_results)
for a in s.architectures:
- log(generate_sources(s.suite_id, c, a.arch_id, 'deb'))
- #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log)
- log(generate_sources(s.suite_id, c, a.arch_id, 'udeb'))
- #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'], callback=parse_results)
+ pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=parse_results)
+
+ pool.close()
+ pool.join()
- #pool.close()
- #pool.join()
# this script doesn't change the database
session.close()
+ logger.close()
+
+ sys.exit(pool.overall_status())
+
if __name__ == '__main__':
main()