Merge commit 'ftpmaster/master'

[dak.git] / dak / rm.py

diff --git a/dak/rm.py b/dak/rm.py
index c2a07e8ae1e800a183e5b75a772fbd596261b2ed..5140019454bd268e2f09f85e97733b920639b796 100755 (executable)
--- 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
@@ -106,7 +105,7 @@ def reverse_depends_check(removals, suites, arches=None):
     if arches:
         all_arches = set(arches)
     else:
-        all_arches = set(get_suite_architectures(suites[0]))
+        all_arches = set([x.arch_string for x in get_suite_architectures(suites[0])])
     all_arches -= set(["source", "all"])
     for architecture in all_arches:
         deps = {}
@@ -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...",