Merge remote branch 'ftpmaster/master' into multiproc

Conflicts:
	dak/generate_packages_sources2.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --cc dak/generate_packages_sources2.py
index b157fcbe5fc989d0bb1adce55b9237c1d11313e1,4523252cc0e8ac0f1145fef530bfb155f3536d47..8908e3cffc669665a67e2649ced042c195c4c858
--- 1/dak/generate_packages_sources2.py
--- 2/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:
 -                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)
+                 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()