Merge commit 'ftpmaster/master' into suitesql

[dak.git] / dak / rm.py

diff --git a/dak/rm.py b/dak/rm.py
index 5911eb40e3e19a11ec6b98a9944cc9d07ef84eef..69b35971db1c0d223d5b560c1e82e9c9804355de 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').strip()
+    date = commands.getoutput('date -R')
 
     # Log first; if it all falls apart I want a record that we at least tried.
     logfile = utils.open_file(cnf["Rm::LogFile"], 'a')
@@ -557,7 +557,7 @@ def main ():
         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["__SUBJECT__"] = "Removed package(s) from %s" % (suites_list)
         Subst["__ADMIN_ADDRESS__"] = cnf["Dinstall::MyAdminAddress"]
         Subst["__DISTRO__"] = cnf["Dinstall::MyDistribution"]
         Subst["__WHOAMI__"] = whoami