summaryrefslogtreecommitdiff
path: root/python/pkgmanager.cc
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-03-29 14:22:11 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-03-29 14:22:11 +0200
commit82dc1170b0b29f7bb264d046d1c9253f4d97fb10 (patch)
treefe24df1f2b3c5c1fd3dd4dc171bbfd5d2f8bc694 /python/pkgmanager.cc
parent4f1a8ff1fcd780c2d42dbc59f41ca38581e6f10c (diff)
parent4b74ecd4df220fcb9939445a9774bbcf6ba3212e (diff)
downloadpython-apt-82dc1170b0b29f7bb264d046d1c9253f4d97fb10.tar.gz
If PYTHON_APT_DEPRECATION_WARNINGS is unset, also disable the
deprecation warnings in apt_pkg directly; and don't just disable any deprecation warning in apt/__init__.py (LP: #548623)
Diffstat (limited to 'python/pkgmanager.cc')
-rw-r--r--python/pkgmanager.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/python/pkgmanager.cc b/python/pkgmanager.cc
index 2fda14ee..e8346b3d 100644
--- a/python/pkgmanager.cc
+++ b/python/pkgmanager.cc
@@ -39,9 +39,10 @@ static PyObject *PkgManagerNew(PyTypeObject *type,PyObject *Args,PyObject *kwds)
#ifdef COMPAT_0_7
PyObject *GetPkgManager(PyObject *Self,PyObject *Args)
{
- PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is "
- "deprecated. Please see apt_pkg.PackageManager() for the "
- "replacement.", 1);
+ if (getenv("PYTHON_APT_DEPRECATION_WARNINGS") != NULL)
+ PyErr_WarnEx(PyExc_DeprecationWarning, "apt_pkg.GetPackageManager() is "
+ "deprecated. Please see apt_pkg.PackageManager() for the "
+ "replacement.", 1);
return PkgManagerNew(&PyPackageManager_Type,Args,0);
}
#endif