X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=48abf7318858d486a1a9d1f531998a34595586f9;hb=8f985d666660382d10a43ecc3944950225f24766;hp=4d7e75b75c991b242773080d5585ad5dc934428f;hpb=ced839899ff9a114da58750c268048ea759268fc;p=dak.git

diff --git a/dak/show_new.py b/dak/show_new.py
index 4d7e75b7..48abf731 100755
--- a/dak/show_new.py
+++ b/dak/show_new.py
@@ -37,12 +37,14 @@ from daklib.regexes import re_source_ext
 from daklib.config import Config
 from daklib import daklog
 from daklib.changesutils import *
-from daklib.dakmultiprocessing import Pool
+from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
+from multiprocessing import Manager
 
 # Globals
 Cnf = None
 Options = None
-sources = set()
+manager = Manager()
+sources = manager.list()
 
 
 ################################################################################
@@ -151,6 +153,11 @@ def html_footer():
 
 
 def do_pkg(changes_file):
+    changes_file = utils.validate_changes_file_arg(changes_file, 0)
+    if not changes_file:
+        return
+    print "\n" + changes_file
+
     session = DBConn().session()
     u = Upload()
     u.pkg.changes_file = changes_file
@@ -174,8 +181,9 @@ 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)
             session.close()
-            return
+            return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile)
 
     # Now we'll load the fingerprint
     (u.pkg.changes["fingerprint"], rejects) = utils.check_signature(changes_file, session=session)
@@ -184,8 +192,7 @@ def do_pkg(changes_file):
     u.update_subst()
     files = u.pkg.files
     changes = u.pkg.changes
-    sources.add(htmlname)
-
+    sources.append(htmlname)
 
     for deb_filename, f in files.items():
         if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
@@ -221,6 +228,8 @@ def do_pkg(changes_file):
     outfile.close()
     session.close()
 
+    return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile)
+
 ################################################################################
 
 def usage (exit_code=0):
@@ -266,19 +275,14 @@ def main():
 
     examine_package.use_html=1
 
-    #pool = Pool(processes=1)
+    pool = DakProcessPool()
     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
-        #pool.apply_async(do_pkg, (changes_file,))
-        do_pkg(changes_file)
-    #pool.close()
-    #pool.join()
+        pool.apply_async(do_pkg, (changes_file,))
+    pool.close()
+    pool.join()
 
     files = set(os.listdir(cnf["Show-New::HTMLPath"]))
-    to_delete = filter(lambda x: x.endswith(".html"), files.difference(sources))
+    to_delete = filter(lambda x: x.endswith(".html"), files.difference(set(sources)))
     for f in to_delete:
         os.remove(os.path.join(cnf["Show-New::HTMLPath"],f))