Merge branch 'merge'

[dak.git] / dak / transitions.py

diff --git a/dak/transitions.py b/dak/transitions.py
index 4080f3e63b3ed8a7febc235438d39ac6dc37c055..00348f2dc842c1e50978b07a4046d19864e0f4d3 100755 (executable)
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -457,22 +457,22 @@ def check_transitions(transitions):
                 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?"