Allow per-suite signing keys

[dak.git] / daklib / config.py

diff --git a/daklib/config.py b/daklib/config.py
index 932df6b53c685a8149a53774b60f3299a4ba82d6..dc90d49a5edd435aeb6a54fa2968310a5bb18912 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -36,6 +36,13 @@ import socket
 
 default_config = "/etc/dak/dak.conf" #: default dak config, defines host properties
 
+# suppress some deprecation warnings in squeeze related to apt_pkg
+# module
+import warnings
+warnings.filterwarnings('ignore', ".*apt_pkg.* is deprecated.*", DeprecationWarning)
+
+################################################################################
+
 def which_conf_file():
     return os.getenv("DAK_CONFIG", default_config)
 
@@ -108,10 +115,9 @@ class Config(object):
         """
         for field in [('db_revision',      None,       int),
                       ('defaultsuitename', 'unstable', str),
-                      ('signingkeyids',    '',         str),
                       ('exportpath',       '',         str)
                       ]:
-            setattr(self, 'get_%s' % field[0], lambda x=None: self.get_db_value(field[0], field[1], field[2]))
+            setattr(self, 'get_%s' % field[0], lambda s=None, x=field[0], y=field[1], z=field[2]: self.get_db_value(x, y, z))
             setattr(Config, '%s' % field[0], property(fget=getattr(self, 'get_%s' % field[0])))
 
     def get_defaultsuite(self):