Logger.log(["Policy Queue ACCEPT", srcqueue.queue_name, changesname])
pu = get_processed_upload(upload)
- daklib.announce.announce_accept(upload)
+ daklib.announce.announce_accept(pu)
# TODO: code duplication. Similar code is in process-upload.
# Move .changes to done
if not Options["No-Action"]:
Logger.log(["Policy Queue REJECT", srcqueue.queue_name, upload.changes.changesname])
+ changes = upload.changes
remove_upload(upload, transaction)
+ session.delete(changes)
################################################################################
fs.unlink(os.path.join(queuedir, upload.changes.changesname))
session.delete(upload)
- session.delete(changes)
session.flush()
################################################################################
try:
return function(directory, upload, *args, **kwargs)
except (daklib.archive.ArchiveException, daklib.checks.Reject) as e:
- reason = e
+ reason = unicode(e)
except Exception as e:
reason = "There was an uncaught exception when processing your upload:\n{0}\nAny original reject reason follows below.".format(traceback.format_exc())
cnf = Config()
subst = _subst_for_upload(upload)
- accepted_to_real_suite = any(suite.policy_queue in None for suite in upload.suites)
+ accepted_to_real_suite = any(suite.policy_queue is None for suite in upload.suites)
suite_names = []
for suite in upload.suites:
if accepted_to_real_suite and upload.sourceful:
# senf mail to announce lists and tracking server
- announce = set(suite.announce or [] for suite in upload.suites if suite.policy_queue is None)
+ announce = set()
+ for suite in upload.suites:
+ if suite.policy_queue is None:
+ continue
+ announce.update(suite.announce or [])
+
announce_list_address = ", ".join(announce)
tracking = cnf.get('Dinstall::TrackingServer')
if tracking:
announce_list_address = "{0}\n{1}@{2}".format(announce_list_address, upload.source, tracking)
- my_subst = subst.copy()
- my_subst['__ANNOUNCE_LIST_ADDRESS__'] = announce_list_address
+ if len(announce_list_address) != 0:
+ my_subst = subst.copy()
+ my_subst['__ANNOUNCE_LIST_ADDRESS__'] = announce_list_address
- message = TemplateSubst(my_subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
- utils.send_mail(message)
+ message = TemplateSubst(my_subst, os.path.join(cnf['Dir::Templates'], 'process-unchecked.announce'))
+ send_mail(message)
if accepted_to_real_suite and upload.sourceful and cnf.find_b('Dinstall::CloseBugs'):
for bug in upload.bugs: