Merge remote branch 'mhy/master' into merge

Conflicts:
	daklib/utils.py

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/daklib/utils.py b/daklib/utils.py
index 0b2d8c87eca2bfbcc5933b603159ffffc0d568b8..c0a3bdff2936333d87385f473f4b031df08de180 100755 (executable)
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -39,7 +39,7 @@ import re
 import email as modemail
 import subprocess
 
-from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type
+from dbconn import DBConn, get_architecture, get_component, get_suite, get_override_type, Keyring
 from dak_exceptions import *
 from textutils import fix_maintainer
 from regexes import re_html_escaping, html_escaping, re_single_line_field, \
@@ -1336,7 +1336,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: