Consolidate warning configuration even more.

Signed-off-by: Torsten Werner <twerner@debian.org>

diff --git a/daklib/config.py b/daklib/config.py
index 18ce9b721baba1db1e40c4f43154603164cdb2b1..284cf1cca207e28294e360678fddca15fa3f3405 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -43,10 +43,7 @@ warnings.filterwarnings('ignore', \
     "Attribute '.*' of the 'apt_pkg.*' 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\.ParseTagFile\(\) is deprecated\. Please see apt_pkg\.TagFile\(\) for the replacement\.", \
+    "apt_pkg.*\(\) is deprecated\. Please see apt_pkg.*\(\) for the replacement\.", \
     DeprecationWarning)
 
 ################################################################################

diff --git a/daklib/queue.py b/daklib/queue.py
index 2b7f52048a29d2a055fcce91faba825d29bc548c..ef781f19e6c24fcdad659349e6669f6d231b0596 100755 (executable)
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -56,16 +56,6 @@ from textutils import fix_maintainer
 from lintian import parse_lintian_output, generate_reject_messages
 from contents import UnpackedSource
 
-# suppress some deprecation warnings in squeeze related to apt_pkg
-# module
-import warnings
-warnings.filterwarnings('ignore', \
-    "apt_pkg.ParseSection\(\) is deprecated. Please see apt_pkg\.TagSection\(\) for the replacement\.", \
-    DeprecationWarning)
-warnings.filterwarnings('ignore', \
-    "Attribute '.*' of the 'apt_pkg\.TagSection' object is deprecated, use '.*' instead\.", \
-    DeprecationWarning)
-
 ###############################################################################
 
 def get_type(f, session):