X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fconfig.py;h=fef7512d8b405ccf8e72e8d2164ecb5499cba3af;hb=8d28609033fdaedc4ae0033762f5b8c038293843;hp=aad28d8a6f5e9260deefca63a050d2bd7176ebd4;hpb=e2763988b86ee79352350326152a17e561dd0ad4;p=dak.git diff --git a/daklib/config.py b/daklib/config.py old mode 100644 new mode 100755 index aad28d8a..fef7512d --- a/daklib/config.py +++ b/daklib/config.py @@ -36,6 +36,18 @@ 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', \ + "Attribute '.*' of the 'apt_pkg.*' object is deprecated, use '.*' instead\.", \ + DeprecationWarning) +warnings.filterwarnings('ignore', \ + "apt_pkg.*\(\) is deprecated\. .* apt_pkg.*\(\) for the replacement\.", \ + DeprecationWarning) + +################################################################################ + def which_conf_file(): return os.getenv("DAK_CONFIG", default_config) @@ -107,8 +119,11 @@ class Config(object): Of course, what the values do is another matter """ for field in [('db_revision', None, int), - ('defaultsuitename', 'unstable', str)]: - setattr(self, 'get_%s' % field[0], lambda x=None: self.get_db_value(field[0], field[1], field[2])) + ('defaultsuitename', 'unstable', str), + ('signingkeyids', '', str), + ('exportpath', '', str) + ]: + 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):