Fix spelling of "IOError" so we indeed don't raise an exception

[dak.git] / dak / show_new.py

diff --git a/dak/show_new.py b/dak/show_new.py
index cdd1473ad7428a178af0ee2d1e2f8fb4d3944834..6d357134b23c2f19fd2659cfe35327441fee4069 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
@@ -171,36 +172,33 @@ def do_pkg(changes_file):
             u.check_source_against_db(deb_filename, session)
     u.pkg.changes["suite"] = u.pkg.changes["distribution"]
 
-    new = determine_new(u.pkg.changes, files, 0)
-
-    stdout_fd = sys.stdout
+    new, byhand = determine_new(u.pkg.changes_file, u.pkg.changes, files, 0, session)
 
     htmlname = changes["source"] + "_" + changes["version"] + ".html"
     sources.add(htmlname)
     # do not generate html output if that source/version already has one.
     if not os.path.exists(os.path.join(cnf["Show-New::HTMLPath"],htmlname)):
-        sys.stdout = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w")
+        outfile = open(os.path.join(cnf["Show-New::HTMLPath"],htmlname),"w")
 
         filestoexamine = []
         for pkg in new.keys():
             for fn in new[pkg]["files"]:
                 filestoexamine.append(fn)
 
-        print html_header(changes["source"], filestoexamine)
+        print >> outfile, html_header(changes["source"], filestoexamine)
 
-        check_valid(new)
+        check_valid(new, session)
         distribution = changes["distribution"].keys()[0]
-        print examine_package.display_changes(distribution, changes_file)
+        print >> outfile, examine_package.display_changes(distribution, changes_file)
 
         for fn in filter(lambda fn: fn.endswith(".dsc"), filestoexamine):
-            print examine_package.check_dsc(distribution, fn)
+            print >> outfile, examine_package.check_dsc(distribution, fn, session)
         for fn in filter(lambda fn: fn.endswith(".deb") or fn.endswith(".udeb"), filestoexamine):
-            print examine_package.check_deb(distribution, fn)
+            print >> outfile, examine_package.check_deb(distribution, fn, session)
+
+        print >> outfile, html_footer()
 
-        print html_footer()
-        if sys.stdout != stdout_fd:
-            sys.stdout.close()
-            sys.stdout = stdout_fd
+       outfile.close()
     session.close()
 
 ################################################################################
@@ -248,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))