commit: 22e8951521558a4488a44f4bdd276ced7c24b950 Author: M. J. Everitt <m.j.everitt <AT> iee <DOT> org> AuthorDate: Sat Dec 15 01:52:54 2018 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Dec 20 04:24:31 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=22e89515
Provide compatibility support for old PORT_LOGDIR* variable names Suggested-by: Zac Medico <zmedico <AT> gentoo.org> Acked-by: Michael Everitt <m.j.everitt <AT> iee.org> Bug: https://bugs.gentoo.org/668538 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/package/ebuild/config.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index a68df5807..8de23e2e5 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -155,6 +155,9 @@ class config(object): _constant_keys = frozenset(['PORTAGE_BIN_PATH', 'PORTAGE_GID', 'PORTAGE_PYM_PATH', 'PORTAGE_PYTHONPATH']) + _deprecated_keys = {'PORTAGE_LOGDIR': 'PORT_LOGDIR', + 'PORTAGE_LOGDIR_CLEAN': 'PORT_LOGDIR_CLEAN'} + _setcpv_aux_keys = ('BDEPEND', 'DEFINED_PHASES', 'DEPEND', 'EAPI', 'HDEPEND', 'INHERITED', 'IUSE', 'REQUIRED_USE', 'KEYWORDS', 'LICENSE', 'PDEPEND', 'PROPERTIES', 'RDEPEND', 'SLOT', @@ -2653,6 +2656,14 @@ class config(object): except KeyError: pass + deprecated_key = self._deprecated_keys.get(mykey) + if deprecated_key is not None: + value = self._getitem(deprecated_key) + #warnings.warn(_("Key %s has been renamed to %s. Please ", + # "update your configuration") % (deprecated_key, mykey), + # UserWarning) + return value + raise KeyError(mykey) def get(self, k, x=None):
