Merge remote-tracking branch 'ansgar/fix-acl' into merge

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index c77e93f32845b464922fbeca55ffd4a1fa22934a..798aa3b7b8948a8652760111d5e196e20b505de8 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -584,9 +584,9 @@ def show_keyring(command):
     if mode == 'list-all':
         pass
     elif mode == 'list-binary':
-        q = q.filter(Keyring.default_source_acl_id == None)
+        q = q.join(Keyring.acl).filter(ACL.allow_source == False)
     elif mode == 'list-source':
-        q = q.filter(Keyring.default_source_acl_id != None)
+        q = q.join(Keyring.acl).filter(ACL.allow_source == True)
     else:
         die("E: keyring command unknown")