From: Mark Hymers Date: Sat, 7 May 2011 12:35:26 +0000 (+0100) Subject: Merge remote branch 'ftpmaster/master' into multiproc X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=99749f86a3ca945f6f9f322f5694255e47ee7809;p=dak.git Merge remote branch 'ftpmaster/master' into multiproc Conflicts: dak/generate_packages_sources2.py Signed-off-by: Mark Hymers --- 99749f86a3ca945f6f9f322f5694255e47ee7809 diff --cc dak/generate_packages_sources2.py index b157fcbe,4523252c..8908e3cf --- a/dak/generate_packages_sources2.py +++ b/dak/generate_packages_sources2.py @@@ -280,14 -273,18 +280,16 @@@ def main() if s.untouchable and not force: utils.fubar("Refusing to touch %s (untouchable and not forced)" % s.suite_name) for c in component_ids: - logger.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: + if a == 'source': + continue - logger.log(generate_packages(s.suite_id, c, a.arch_id, 'deb')) - #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'deb'], callback=log) - logger.log(generate_packages(s.suite_id, c, a.arch_id, 'udeb')) - #pool.apply_async(generate_packages, [s.suite_id, c, a.arch_id, 'udeb'], callback=log) + 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()