Use corrent name for rejection template.

diff --git a/ChangeLog b/ChangeLog
index f84478160ad8f20026cf6698b50a022c40e5c277..929466c61ece3ba354a509ea68abcfe8632807f0 100644 (file)
--- 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
 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 6dc0cd9e96c1cb48985cdcc672e8135efd3e6eaa..3194e19c87bce1321859ec5abc58a530623c1e29 100644 (file)
--- 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)
             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"])
         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"]
             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)
 
             # Write the rejection email out as the <foo>.reason file
             os.write(reason_fd, reject_mail_message)