From: Mark Hymers <mhy@debian.org>
Date: Thu, 24 Mar 2011 10:42:09 +0000 (+0000)
Subject: Load keyring names from the database instead of the config file
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c831895d5f77fdedd3c8c3d1835154def67824;p=dak

Load keyring names from the database instead of the config file

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

diff --git a/daklib/utils.py b/daklib/utils.py
index b5e090da..02558deb 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
+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: