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 7ec5f094457ad65f45b94a6cafed4f7aaf2fb936..3ad4a63dc4014c8391c1ba16889f1812a464074d 100755 (executable)
--- 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 627df4367b3a5412f3216e317f62c7de8a610237..bc1b873997620854e768647aaeae0644d9d5df10 100755 (executable)
--- 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 454fe81adfa30b1795870b3e1b6549279f926298..c807c78c3b0411532b992e7607aee99a8c5f9e90 100644 (file)
--- 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 e7268254c0dd83140d75fd2d3cbf88de979ca95f..09b5e0c9e8b45b3b5150df2316669cade581fa94 100644 (file)
--- 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: