X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fconfig.py;h=fef7512d8b405ccf8e72e8d2164ecb5499cba3af;hb=8d28609033fdaedc4ae0033762f5b8c038293843;hp=9993ec3adbfb3bb2d61c4168d726e72eb7bc5cad;hpb=4830d9be143c7645ea932b53fae095e275ad7814;p=dak.git diff --git a/daklib/config.py b/daklib/config.py index 9993ec3a..fef7512d 100755 --- a/daklib/config.py +++ b/daklib/config.py @@ -40,12 +40,14 @@ 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\.", \ + "apt_pkg.*\(\) is deprecated\. .* apt_pkg.*\(\) for the replacement\.", \ DeprecationWarning) +################################################################################ + def which_conf_file(): return os.getenv("DAK_CONFIG", default_config)