X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Frm.py;h=be3e16766e86b94d371f58954b3b1964acb8e208;hb=d0779ef69d429a210405002f252067806ddfa6f2;hp=8ed03412293f1d946976daa06b855bc394a7f7c4;hpb=f40b8bfec79077b5c7a5bf0b78af03dba815cbad;p=dak.git

diff --git a/dak/rm.py b/dak/rm.py
index 8ed03412..be3e1676 100755
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -41,7 +41,6 @@
 
 import commands
 import os
-import re
 import sys
 import apt_pkg
 import apt_inst
@@ -506,8 +505,8 @@ def main ():
     logfile.write("----------------------------------------------\n")
     logfile.flush()
 
-    dsc_type_id = get_override_type('dsc', session)
-    deb_type_id = get_override_type('deb', session)
+    dsc_type_id = get_override_type('dsc', session).overridetype_id
+    deb_type_id = get_override_type('deb', session).overridetype_id
 
     # Do the actual deletion
     print "Deleting...",
@@ -551,7 +550,7 @@ 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