Restore old X-Katie header contents temporarily as it's in use by 3rd parties.

[dak.git] / dak / rm.py

diff --git a/dak/rm.py b/dak/rm.py
index aac75a36f526916328f889fc9e656bcfa5ba2309..37cdad28bbcd2e46bb019e3f60ce2a91b1fc439c 100755 (executable)
--- a/dak/rm.py
+++ b/dak/rm.py
@@ -251,7 +251,7 @@ def main ():
        usage()
 
     projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
-    database.init(Cnf, projectB)
+    daklib.database.init(Cnf, projectB)
 
     # Sanity check options
     if not arguments:
@@ -282,7 +282,7 @@ def main ():
     #
     carbon_copy = []
     for copy_to in daklib.utils.split_args(Options.get("Carbon-Copy")):
-        if daklib.utils.str_isnum(copy_to):
+        if copy_to.isdigit():
             carbon_copy.append(copy_to + "@" + Cnf["Dinstall::BugServer"])
         elif copy_to == 'package':
             for package in arguments:
@@ -298,7 +298,7 @@ def main ():
         field = "b.package"
     else:
         field = "s.source"
-    con_packages = "AND %s IN (%s)" % (field, ", ".join(map(repr, arguments)))
+    con_packages = "AND %s IN (%s)" % (field, ", ".join([ repr(i) for i in arguments ]))
 
     (con_suites, con_architectures, con_components, check_source) = \
                  daklib.utils.parse_args(Options)
@@ -309,7 +309,7 @@ def main ():
     suites_list = daklib.utils.join_with_commas_and(suites)
     if not Options["No-Action"]:
         for suite in suites:
-            suite_id = database.get_suite_id(suite)
+            suite_id = daklib.database.get_suite_id(suite)
             if suite_id != -1:
                 suite_ids_list.append(suite_id)
             if suite == "stable":
@@ -420,7 +420,7 @@ def main ():
 
     maintainer_list = []
     for maintainer_id in maintainers.keys():
-        maintainer_list.append(database.get_maintainer(maintainer_id))
+        maintainer_list.append(daklib.database.get_maintainer(maintainer_id))
     summary = ""
     removals = d.keys()
     removals.sort()
@@ -468,8 +468,8 @@ def main ():
     logfile.write("----------------------------------------------\n")
     logfile.flush()
 
-    dsc_type_id = database.get_override_type_id('dsc')
-    deb_type_id = database.get_override_type_id('deb')
+    dsc_type_id = daklib.database.get_override_type_id('dsc')
+    deb_type_id = daklib.database.get_override_type_id('deb')
 
     # Do the actual deletion
     print "Deleting...",
@@ -510,7 +510,7 @@ def main ():
             Subst["__BCC__"] = "Bcc: " + ", ".join(bcc)
         else:
             Subst["__BCC__"] = "X-Filler: 42"
-        Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: this header is obsolete"
+        Subst["__CC__"] = "X-DAK: dak rm\nX-Katie: melanie $Revision: 1.44 $"
         if carbon_copy:
             Subst["__CC__"] += "\nCc: " + ", ".join(carbon_copy)
         Subst["__SUITE_LIST__"] = suites_list