Merge remote branch 'twerner/show-new' into merge

[dak.git] / dak / show_new.py

diff --git a/dak/show_new.py b/dak/show_new.py
index 183c1bb5b1f7bf6ba8ba5d10e288a9039083a780..3c0b046738017f003b7f264d3d493a612b28d764 100755 (executable)
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -37,6 +37,7 @@ from daklib.regexes import re_source_ext
 from daklib.config import Config
 from daklib import daklog
 from daklib.changesutils import *
+from daklib.threadpool import ThreadPool
 
 # Globals
 Cnf = None
@@ -169,6 +170,7 @@ def do_pkg(changes_file):
         else:
             u.source_file_checks(deb_filename, session)
             u.check_source_against_db(deb_filename, session)
+    session.close()
     u.pkg.changes["suite"] = u.pkg.changes["distribution"]
 
     new = determine_new(u.pkg.changes, files, 0)
@@ -196,7 +198,8 @@ def do_pkg(changes_file):
             print >> outfile, examine_package.check_deb(distribution, fn)
 
         print >> outfile, html_footer()
-    session.close()
+
+       outfile.close()
 
 ################################################################################
 
@@ -243,12 +246,14 @@ def main():
 
     examine_package.use_html=1
 
+    threadpool = ThreadPool()
     for changes_file in changes_files:
         changes_file = utils.validate_changes_file_arg(changes_file, 0)
         if not changes_file:
             continue
         print "\n" + changes_file
-        do_pkg (changes_file)
+        threadpool.queueTask(do_pkg, changes_file)
+    threadpool.joinAll()
 
     files = set(os.listdir(cnf["Show-New::HTMLPath"]))
     to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))