From: Mark Hymers <mhy@debian.org>
Date: Sat, 23 May 2009 15:55:17 +0000 (+0100)
Subject: Merge commit 'dato/master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7c40371fd5e818e0bad7edfa92267d663adf4993;hp=4db8ce23de9866ca93e0b8f1802ac3dd6bdf6508;p=dak.git

Merge commit 'dato/master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>
---

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__