u.check_override()
# Send accept mail, announce to lists and close bugs
- template = os.path.join(cnf["Dir::Templates"], announce)
- u.update_subst()
- u.Subst["__SUITE__"] = ""
- mail_message = utils.TemplateSubst(u.Subst, template)
- utils.send_mail(mail_message)
- u.announce(short_summary, True)
+ if announce:
+ template = os.path.join(cnf["Dir::Templates"], announce)
+ u.update_subst()
+ mail_message = utils.TemplateSubst(u.Subst, template)
+ utils.send_mail(mail_message)
+ u.announce(short_summary, True)
################################################################################
def do_autobyhand(u, summary, short_summary, chg, session):
print "Attempting AUTOBYHAND."
- byhandleft = True
+ byhandleft = False
for f, entry in u.pkg.files.items():
byhandfile = f
if result == 0:
os.unlink(byhandfile)
- del entry
+ del u.pkg.files[f]
else:
print "Error processing %s, left as byhand." % (f)
byhandleft = True
# Statically handled queues
target = None
- for q in ["new", "autobyhand", "byhand"]:
+ for q in ["autobyhand", "byhand", "new"]:
if QueueInfo[q]["is"](u):
target = q
break