From: Adeodato Simó <dato@net.com.org.es>
Date: Sat, 23 May 2009 15:32:19 +0000 (+0200)
Subject: Send the "transitions completed" mail to debian-devel instead of the RT.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=bdd0f80d900a9437fc0fbbf4ec1704da75907c69;p=dak.git

Send the "transitions completed" mail to debian-devel instead of the RT.

As per http://lists.debian.org/debian-devel/2009/05/msg00673.html, notice
of transition blocks being lifted is going to be sent to debian-devel and
not to the release team.

This commit also reworks the wording of the body of the message (the
important bit being that the block is lifted, rather than the transitions
were removed from the transitions.yaml file), and it includes the names
of the finished transitions in the Subject of the mail.

Signed-off-by: Adeodato Simó <dato@net.com.org.es>
---

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7860e88c..a057c6fe 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -47,7 +47,7 @@ Dinstall
 
 Transitions
 {
-   Notifications "team@release.debian.org";
+   Notifications "debian-devel@lists.debian.org";
    TempPath "/srv/ftp.debian.org/tmp/";
 };
 
diff --git a/dak/transitions.py b/dak/transitions.py
index 00348f2d..2c7d3d83 100755
--- a/dak/transitions.py
+++ b/dak/transitions.py
@@ -452,8 +452,9 @@ def check_transitions(transitions):
         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]
 
diff --git a/templates/transition.removed b/templates/transition.removed
index 32b0aca1..4e064a3f 100644
--- a/templates/transition.removed
+++ b/templates/transition.removed
@@ -6,10 +6,10 @@ Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
-Subject: Transitions Completed
+Subject: __SUBJECT__
 
-The following transitions are complete and have been removed
-from the transitions list:
+Some transitions for which there was an upload block in place have been
+completed and the block has been automatically lifted:
 
 __TRANSITION_MESSAGE__