debianqueued: log which .dak-commands file we are processing

[dak.git] / dak / admin.py

diff --git a/dak/admin.py b/dak/admin.py
index c77e93f32845b464922fbeca55ffd4a1fa22934a..8ba79797bdaf6345e6d5b1c3bd0206c8c3313c08 100755 (executable)
--- a/dak/admin.py
+++ b/dak/admin.py
@@ -556,6 +556,8 @@ def show_config(command):
             print "PGPORT=%s" % cnf["DB::Port"]
             e.append('PGPORT')
         print "export " + " ".join(e)
+    elif mode == 'get':
+        print cnf.get(args[2])
     else:
         session = DBConn().session()
         try:
@@ -584,9 +586,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")