X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fshow_new.py;h=3b052c18307be406181eef8d2c5e308101998339;hb=2d1714245f6df36ec2c7f2d7154b23e331f150a5;hp=8405aeef9f0fe2391d9e969169b944db7abf179b;hpb=8d96479bcfd210f9cf8f5692b2982d3c3a08ba5c;p=dak.git diff --git a/dak/show_new.py b/dak/show_new.py index 8405aeef..3b052c18 100755 --- a/dak/show_new.py +++ b/dak/show_new.py @@ -37,7 +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 +from daklib.dakmultiprocessing import DakProcessPool # Globals Cnf = None @@ -169,7 +169,7 @@ def do_pkg(changes_file): if os.path.exists(htmlfile) and \ os.stat(htmlfile).st_mtime > os.stat(origchanges).st_mtime: session.close() - return + return (PROC_STATUS_SUCCESS, '%s already up-to-date' % htmlfile) for deb_filename, f in files.items(): if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"): @@ -205,6 +205,8 @@ def do_pkg(changes_file): outfile.close() session.close() + return (PROC_STATUS_SUCCESS, '%s already updated' % htmlfile) + ################################################################################ def usage (exit_code=0): @@ -250,14 +252,15 @@ def main(): examine_package.use_html=1 - threadpool = ThreadPool() + 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 - threadpool.queueTask(do_pkg, changes_file) - threadpool.joinAll() + 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))