remove an unneeded linewrap

[dak.git] / dak / rm.py

diff --git a/dak/rm.py b/dak/rm.py
index 5140019454bd268e2f09f85e97733b920639b796..5911eb40e3e19a11ec6b98a9944cc9d07ef84eef 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -492,7 +492,7 @@ def main ():
     game_over()
 
     whoami = utils.whoami()
-    date = commands.getoutput('date -R')
+    date = commands.getoutput('date -R').strip()
 
     # Log first; if it all falls apart I want a record that we at least tried.
     logfile = utils.open_file(cnf["Rm::LogFile"], 'a')
@@ -550,11 +550,14 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else:
             Subst["__BCC__"] = "X-Filler: 42"
-        Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie"
+        Subst["__CC__"] = "X-DAK: dak rm"
         if carbon_copy:
             Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
         Subst["__SUITE_LIST__"] = suites_list
-        Subst["__SUMMARY__"] = summary
+        summarymail = "%s\n------------------- Reason -------------------\n%s\n" % (summary, Options["Reason"])
+        summarymail += "----------------------------------------------\n"
+        Subst["__SUMMARY__"] = summarymail
+        Subst["__SUBJECT__"] = "Removed package(s) from %s" % (suite_list)
         Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"]
         Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"]
         Subst["__WHOAMI__"] = whoami