X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Futils.py;h=707d3b85bd4564a8262b9b4e8f00ab8ad0ac2490;hb=8d96479bcfd210f9cf8f5692b2982d3c3a08ba5c;hp=0b2d8c87eca2bfbcc5933b603159ffffc0d568b8;hpb=40970b8f6af57da3b1a65237e7bc6af7ba77ec73;p=dak.git diff --git a/daklib/utils.py b/daklib/utils.py index 0b2d8c87..707d3b85 100755 --- 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).filter(Keyring.active == True).all() ] # Autofetch the signing key if that's enabled if autofetch == None: