]> err.no Git - dak/commitdiff
Load keyring names from the database instead of the config file
authorMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 10:42:09 +0000 (10:42 +0000)
committerMark Hymers <mhy@debian.org>
Thu, 24 Mar 2011 10:42:12 +0000 (10:42 +0000)
Signed-off-by: Mark Hymers <mhy@debian.org>
daklib/utils.py

index b5e090da3eb24324f89307fedff7920928115d4c..02558deb38fd72d3a39588c9f0c9fe256a5561e3 100755 (executable)
@@ -39,7 +39,7 @@ import re
 import email as modemail
 import subprocess
 
-from dbconn import DBConn, get_architecture, get_component, get_suite
+from dbconn import DBConn, get_architecture, get_component, get_suite, Keyring
 from dak_exceptions import *
 from textutils import fix_maintainer
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
@@ -1296,7 +1296,7 @@ def check_signature (sig_filename, data_filename="", keyrings=None, autofetch=No
         return (None, rejects)
 
     if not keyrings:
-        keyrings = Cnf.ValueList("Dinstall::GPGKeyring")
+        keyrings = [ x.keyring_name for x in DBConn().session().query(Keyring).all() ]
 
     # Autofetch the signing key if that's enabled
     if autofetch == None: