X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=dak%2Fauto_decruft.py;h=1586fe10fb0365e81243c971d93d138055239c0f;hb=6f863f95e3d1bae18aa5579e958fd8a121b06545;hp=a7c67fa3668ed21895f68a93a7634346e5724954;hpb=3cc947013d99ba4e20b65bd1a9475d9f85421bae;p=dak.git

diff --git a/dak/auto_decruft.py b/dak/auto_decruft.py
index a7c67fa3..1586fe10 100644
--- a/dak/auto_decruft.py
+++ b/dak/auto_decruft.py
@@ -76,7 +76,8 @@ def compute_sourceless_groups(suite_id, session):
     """""
     rows = query_without_source(suite_id, session)
     message = '[auto-cruft] no longer built from source, no reverse dependencies'
-    arch_all_id_tuple = tuple([get_architecture('all', session=session)])
+    arch = get_architecture('all', session=session)
+    arch_all_id_tuple = tuple([arch.arch_id])
     arch_all_list = ["all"]
     for row in rows:
         package = row[0]
@@ -413,8 +414,9 @@ def main ():
                  ('n',"dry-run","Auto-Decruft::Options::Dry-Run"),
                  ('d',"debug","Auto-Decruft::Options::Debug"),
                  ('s',"suite","Auto-Decruft::Options::Suite","HasArg"),
-                 ('z','if-newer-version-in',"Auto-Decruft::Options::OtherSuite", "HasArg"),
-                 ('Z','if-newer-version-in-rm-msg',"Auto-Decruft::Options::OtherSuiteRMMsg", "HasArg")]
+                 # The "\0" seems to be the only way to disable short options.
+                 ("\0",'if-newer-version-in',"Auto-Decruft::Options::OtherSuite", "HasArg"),
+                 ("\0",'if-newer-version-in-rm-msg',"Auto-Decruft::Options::OtherSuiteRMMsg", "HasArg")]
     for i in ["help", "Dry-Run", "Debug", "OtherSuite", "OtherSuiteRMMsg"]:
         if not cnf.has_key("Auto-Decruft::Options::%s" % (i)):
             cnf["Auto-Decruft::Options::%s" % (i)] = ""