Consolidate warnings to support dak rm, too.

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

diff --git a/dak/cruft_report.py b/dak/cruft_report.py
index c691bb22609b113f8ed7f98b8efcc2f702af31c9..08d336d4466ea41fcef987c49a9fa105006e8b45 100755 (executable)
--- a/dak/cruft_report.py
+++ b/dak/cruft_report.py
@@ -35,19 +35,6 @@ Check for obsolete binary packages
 
 ################################################################################
 
-import warnings
-warnings.filterwarnings('ignore', \
-    "apt_pkg\.ParseTagFile\(\) is deprecated\. Please see apt_pkg\.TagFile\(\) for the replacement\.", \
-    DeprecationWarning)
-warnings.filterwarnings('ignore', \
-    "Attribute '.*' of the 'apt_pkg\.TagFile' object is deprecated, use '.*' instead\.", \
-    DeprecationWarning)
-warnings.filterwarnings('ignore', \
-    "Attribute 'Find' of the 'apt_pkg\.TagSection' object is deprecated, use 'find' instead\.", \
-    DeprecationWarning)
-
-################################################################################
-
 import commands, os, sys, re
 import apt_pkg
 

diff --git a/daklib/config.py b/daklib/config.py
index 9993ec3adbfb3bb2d61c4168d726e72eb7bc5cad..18ce9b721baba1db1e40c4f43154603164cdb2b1 100755 (executable)
--- a/daklib/config.py
+++ b/daklib/config.py
@@ -40,11 +40,16 @@ default_config = "/etc/dak/dak.conf" #: default dak config, defines host propert
 # module
 import warnings
 warnings.filterwarnings('ignore', \
-    "Attribute '.*' of the 'apt_pkg\.Configuration' object is deprecated, use '.*' instead\.", \
+    "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\.", \
+    DeprecationWarning)
+
+################################################################################
 
 def which_conf_file():
     return os.getenv("DAK_CONFIG", default_config)