Merge remote-tracking branch 'ansgar/p-s-from-db' into merge

[dak.git] / daklib / config.py

diff --git a/daklib/config.py b/daklib/config.py
index 9993ec3adbfb3bb2d61c4168d726e72eb7bc5cad..ed8cf1d0d0e7cb57b2ba0ff1fdffdd6922508e81 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -39,12 +39,9 @@ default_config = "/etc/dak/dak.conf" #: default dak config, defines host propert
 # 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)
+warnings.filterwarnings('ignore', ".*apt_pkg.* is deprecated.*", DeprecationWarning)
+
+################################################################################
 
 def which_conf_file():
     return os.getenv("DAK_CONFIG", default_config)