elif answer == 'y':
print "Committing"
subst = {}
+ subst['__SUBJECT__'] = "Transitions completed: " + ", ".join(sorted(to_remove))
subst['__TRANSITION_MESSAGE__'] = "The following transitions were removed:\n"
- for remove in to_remove:
+ for remove in sorted(to_remove):
subst['__TRANSITION_MESSAGE__'] += info[remove] + '\n'
del transitions[remove]
- edit_file = temp_transitions_file(transitions)
- write_transitions_from_file(edit_file)
-
# If we have a mail address configured for transitions,
# send a notification
subst['__TRANSITION_EMAIL__'] = Cnf.get("Transitions::Notifications", "")
if subst['__TRANSITION_EMAIL__'] != "":
- print "Sending notification to %s" % subst['__TRANSITION__EMAIL__']
+ print "Sending notification to %s" % subst['__TRANSITION_EMAIL__']
subst['__DAK_ADDRESS__'] = Cnf["Dinstall::MyEmailAddress"]
subst['__BCC__'] = 'X-DAK: dak transitions'
if Cnf.has_key("Dinstall::Bcc"):
- subst["__BCC__"] += '\nBcc: %s' % Cnf["Dinstall:Bcc"]
+ subst["__BCC__"] += '\nBcc: %s' % Cnf["Dinstall::Bcc"]
message = utils.TemplateSubst(subst,
os.path.join(Cnf["Dir::Templates"], 'transition.removed'))
utils.send_mail(message)
+ edit_file = temp_transitions_file(transitions)
+ write_transitions_from_file(edit_file)
+
print "Done"
else:
print "WTF are you typing?"