dak/acl.py

@@ -165,9 +165,8 @@ def acl_deny(acl_name, fingerprint, sources):
 
     for source in sources:
         result = session.execute(tbl.delete().where(tbl.c.acl_id == acl_id).where(tbl.c.fingerprint_id == fingerprint_id).where(tbl.c.source == source))
-        if result.rowcount != 1:
-            # TODO: Nicer error message?
-            raise Exception("Tried to deny uploads of '{}', but was not allowed before.".format(source))
+        if result.rowcount < 1:
+            print("W: Tried to deny uploads of '{}', but was not allowed before.".format(source))
 
     session.commit()
 

dak/manage_external_signature_requests.py

@@ -41,7 +41,7 @@ Logger = None
 def usage (exit_code=0):
     print("""Usage: dak manage-external-signature-requests [OPTIONS]
 Manage external signature requests such as requests to sign EFI binaries or
-kernel module.
+kernel modules.
 
   -h, --help                 show this help and exit""")
 
@@ -60,7 +60,7 @@ def main ():
 
     Arguments = [('h',"help","Manage-External-Signature-Requests::Options::Help")]
 
-    queue_names = apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
+    apt_pkg.parse_commandline(cnf.Cnf, Arguments, sys.argv)
     Options = cnf.subtree("Manage-External-Signature-Requests::Options")
 
     if Options["Help"]: