From 67421d267223b8a92c8acf8c00aa30d48e565ffa Mon Sep 17 00:00:00 2001 From: Torsten Werner Date: Fri, 25 Mar 2011 17:34:22 +0100 Subject: [PATCH] Consolidate warnings to support dak rm, too. Signed-off-by: Torsten Werner --- dak/cruft_report.py | 13 ------------- daklib/config.py | 7 ++++++- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/dak/cruft_report.py b/dak/cruft_report.py index c691bb22..08d336d4 100755 --- 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 9993ec3a..18ce9b72 100755 --- 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) -- 2.39.5