from daklib.regexes import re_source_ext
from daklib.config import Config
from daklib import daklog
-from daklib.changesutils import *
from daklib.dakmultiprocessing import DakProcessPool, PROC_STATUS_SUCCESS, PROC_STATUS_SIGNALRAISED
from multiprocessing import Manager, TimeoutError
def do_pkg(upload_id):
+ cnf = Config()
+
session = DBConn().session()
upload = session.query(PolicyQueueUpload).filter_by(id=upload_id).one()
htmlfile = os.path.join(cnf['Show-New::HTMLPath'], htmlname)
# Have we already processed this?
- if False and os.path.exists(htmlfile) and \
+ if os.path.exists(htmlfile) and \
os.stat(htmlfile).st_mtime > time.mktime(changes.created.timetuple()):
with open(htmlfile, "r") as fd:
if fd.read() != timeout_str:
htmlfiles_to_process.append(htmlfile)
sources.append(htmlname)
+ group = cnf.get('Dinstall::UnprivGroup') or None
+
with open(htmlfile, 'w') as outfile:
- with policy.UploadCopy(upload) as upload_copy:
+ with policy.UploadCopy(upload, group=group) as upload_copy:
handler = policy.PolicyQueueUploadHandler(upload, session)
missing = [ (o['type'], o['package']) for o in handler.missing_overrides() ]
distribution = changes.distribution
################################################################################
def main():
+ examine_package.use_html = True
+ pool = DakProcessPool(processes=5)
+
session = DBConn().session()
upload_ids = [ u.id for u in init(session) ]
session.close()
- examine_package.use_html=1
-
- pool = DakProcessPool(processes=5)
- p = pool.map_async(do_pkg, upload_ids)
+ for upload_id in upload_ids:
+ pool.apply_async(do_pkg, [upload_id])
pool.close()
- p.wait(timeout=600)
+ #p.wait(timeout=600)
+ pool.join()
for htmlfile in htmlfiles_to_process:
with open(htmlfile, "w") as fd:
fd.write(timeout_str)