X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=eac91d8a419201e970a132afab11ab3a680482c5;hb=c9380046315c3a661b90de240459f40424b0993b;hp=194559c2076f70ccead7159aa7c37c3cb8971e49;hpb=c20a288af636458a404f8f92b499ba3c17b240e0;p=dak.git

diff --git a/dak/show_new.py b/dak/show_new.py
index 194559c2..eac91d8a 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -46,6 +46,7 @@ Options = None
 manager = Manager()
 sources = manager.list()
 htmlfiles_to_process = manager.list()
+timeout_str = "Timed out while processing"
 
 
 ################################################################################
@@ -172,7 +173,6 @@ def do_pkg(changes_file):
     if u.pkg.changes.has_key('source') and u.pkg.changes.has_key('version'):
         htmlname = u.pkg.changes["source"] + "_" + u.pkg.changes["version"] + ".html"
         htmlfile = os.path.join(cnf["Show-New::HTMLPath"], htmlname)
-        htmlfiles_to_process.append(htmlfile)
     else:
         # Changes file was bad
         print "Changes file %s missing source or version field" % changes_file
@@ -181,11 +181,15 @@ def do_pkg(changes_file):
     # Have we already processed this?
     if os.path.exists(htmlfile) and \
         os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime:
-            sources.append(htmlname)
-            return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile)
+            with open(htmlfile, "r") as fd:
+                if fd.read() != timeout_str:
+                    sources.append(htmlname)
+                    return (PROC_STATUS_SUCCESS,
+                            '%s already up-to-date' % htmlfile)
 
     # Now we'll load the fingerprint
     session = DBConn().session()
+    htmlfiles_to_process.append(htmlfile)
     (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file, session=session)
     new_queue = get_policy_queue('new', session );
     u.pkg.directory = new_queue.path
@@ -254,12 +258,12 @@ def init(session):
         if not cnf.has_key("Show-New::Options::%s" % (i)):
             cnf["Show-New::Options::%s" % (i)] = ""
 
-    changes_files = apt_pkg.ParseCommandLine(cnf.Cnf,Arguments,sys.argv)
+    changes_files = apt_pkg.parse_commandline(cnf.Cnf,Arguments,sys.argv)
     if len(changes_files) == 0:
         new_queue = get_policy_queue('new', session );
         changes_files = utils.get_changes_files(new_queue.path)
 
-    Options = cnf.SubTree("Show-New::Options")
+    Options = cnf.subtree("Show-New::Options")
 
     if Options["help"]:
         usage()
@@ -276,15 +280,13 @@ def main():
 
     examine_package.use_html=1
 
-    pool = DakProcessPool()
+    pool = DakProcessPool(processes=5)
     p = pool.map_async(do_pkg, changes_files)
     pool.close()
-    try:
-        p.get(timeout=600)
-    except TimeoutError:
-        for htmlfile in htmlfiles_to_process:
-            with open(htmlfile, "w") as fd:
-                fd.write("Timed out while processing")
+    p.wait(timeout=600)
+    for htmlfile in htmlfiles_to_process:
+        with open(htmlfile, "w") as fd:
+            fd.write(timeout_str)
 
     files = set(os.listdir(cnf["Show-New::HTMLPath"]))
     to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))