From: James Troup <james@nocrew.org>
Date: Mon, 12 Jun 2006 00:37:01 +0000 (-0700)
Subject: Use corrent name for rejection template.
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=ed1ddc2e20531d2c9de54c3fab6c075a912b615a;p=dak.git

Use corrent name for rejection template.
---

diff --git a/ChangeLog b/ChangeLog
index f8447816..929466c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-11  James Troup  <troup@spohr.debian.org>
+
+	* daklib/queue.py (Upload.do_reject): use correct name for
+	rejection template.
+
 2006-06-11  James Troup  <james@nocrew.org>
 
 	* dak/override.py (main): temporarily add content of old X-Katie
diff --git a/daklib/queue.py b/daklib/queue.py
index 6dc0cd9e..3194e19c 100644
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -646,7 +646,7 @@ distribution."""
             Subst["__MANUAL_REJECT_MESSAGE__"] = ""
             Subst["__CC__"] = "X-DAK-Rejection: automatic (moo)\nX-Katie-Rejection: automatic (moo)"
             os.write(reason_fd, reject_message)
-            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/dak.rejected")
+            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/queue.rejected")
         else:
             # Build up the rejection email
             user_email_address = utils.whoami() + " <%s>" % (Cnf["Dinstall::MyAdminAddress"])
@@ -654,7 +654,7 @@ distribution."""
             Subst["__REJECTOR_ADDRESS__"] = user_email_address
             Subst["__MANUAL_REJECT_MESSAGE__"] = reject_message
             Subst["__CC__"] = "Cc: " + Cnf["Dinstall::MyEmailAddress"]
-            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/dak.rejected")
+            reject_mail_message = utils.TemplateSubst(Subst,Cnf["Dir::Templates"]+"/queue.rejected")
             # Write the rejection email out as the <foo>.reason file
             os.write(reason_fd, reject_mail_message)