Suppress warnings in the most suitable files.

[dak.git] / daklib / config.py

diff --git a/daklib/config.py b/daklib/config.py
index 1c3f92ba5d41ec5b4bc9a64301be8bb1a23512a6..9993ec3adbfb3bb2d61c4168d726e72eb7bc5cad 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -36,6 +36,16 @@ 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\.Configuration' object is deprecated, use '.*' instead\.", \
+    DeprecationWarning)
+warnings.filterwarnings('ignore', \
+    "apt_pkg\.newConfiguration\(\) is deprecated\. Use apt_pkg\.Configuration\(\) instead\.", \
+    DeprecationWarning)
+
 def which_conf_file():
     return os.getenv("DAK_CONFIG", default_config)
 
@@ -108,9 +118,10 @@ class Config(object):
         """
         for field in [('db_revision',      None,       int),
                       ('defaultsuitename', 'unstable', str),
-                      ('signingkeyids',    '',         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):