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 7860e88c868ed3473fc965ca93e45f63f948de3a..a057c6fe4d78cfe5c72ac8e9c6b8e271dc65a056 100644 (file)
--- 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 00348f2dc842c1e50978b07a4046d19864e0f4d3..2c7d3d8333071b61f41448806f8fc4e007b60e9e 100755 (executable)
--- 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 32b0aca1918aa2c1cb0a5c8f7a48710c60f094f8..4e064a3f6518d42751e53a6651372e7d1f775d4e 100644 (file)
--- 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__