From: Ansgar Burchardt <ansgar@43-1.org>
Date: Mon, 30 Aug 2010 09:55:04 +0000 (+0900)
Subject: Include distribution name in ACCEPTED and INSTALLED mails
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=31d36ceb62dfd471afa6dd6a521c16146215f8e8;p=dak.git

Include distribution name in ACCEPTED and INSTALLED mails

Signed-off-by: Ansgar Burchardt <ansgar@43-1.org>
---

diff --git a/daklib/queue.py b/daklib/queue.py
index 7ec5f094..3ad4a63d 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -353,6 +353,7 @@ class Upload(object):
         self.Subst["__REJECT_MESSAGE__"] = self.package_info()
         self.Subst["__SOURCE__"] = self.pkg.changes.get("source", "Unknown")
         self.Subst["__VERSION__"] = self.pkg.changes.get("version", "Unknown")
+        self.Subst["__SUITE__"] = self.pkg.changes.get("distribution", "unknown")
 
     ###########################################################################
     def load_changes(self, filename):
@@ -1938,7 +1939,6 @@ distribution."""
             UrgencyLog().log(self.pkg.dsc["source"], self.pkg.dsc["version"], self.pkg.changes["urgency"])
 
         self.update_subst()
-        self.Subst["__SUITE__"] = ""
         self.Subst["__SUMMARY__"] = summary
         mail_message = utils.TemplateSubst(self.Subst,
                                            os.path.join(cnf["Dir::Templates"], 'process-unchecked.accepted'))
diff --git a/daklib/queue_install.py b/daklib/queue_install.py
index 627df436..bc1b8739 100755
--- a/daklib/queue_install.py
+++ b/daklib/queue_install.py
@@ -72,7 +72,6 @@ def package_to_queue(u, summary, short_summary, queue, chg, session, announce=No
     if announce:
         template = os.path.join(cnf["Dir::Templates"], announce)
         u.update_subst()
-        u.Subst["__SUITE__"] = ""
         mail_message = utils.TemplateSubst(u.Subst, template)
         utils.send_mail(mail_message)
         u.announce(short_summary, True)
diff --git a/templates/process-accepted.install b/templates/process-accepted.install
index 454fe81a..c807c78c 100644
--- a/templates/process-accepted.install
+++ b/templates/process-accepted.install
@@ -7,7 +7,7 @@ Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
-Subject: __CHANGES_FILENAME__ INSTALLED__SUITE__
+Subject: __CHANGES_FILENAME__ INSTALLED into __SUITE__
 
 __REJECT_MESSAGE__
 Installing:
diff --git a/templates/process-unchecked.accepted b/templates/process-unchecked.accepted
index e7268254..09b5e0c9 100644
--- a/templates/process-unchecked.accepted
+++ b/templates/process-unchecked.accepted
@@ -7,7 +7,7 @@ Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
-Subject: __CHANGES_FILENAME__ ACCEPTED__SUITE__
+Subject: __CHANGES_FILENAME__ ACCEPTED into __SUITE__
 
 __REJECT_MESSAGE__
 Accepted: