diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-01-17 22:06:27 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-01-22 22:01:14 -0800 |
| commit | 7e50a057958624dd728e858a3c07517240f85d02 (patch) | |
| tree | 696cc178c70133b897dd105611a3dbbc2a9eb22d | |
| parent | dosym: revert deprecated prefix compat (bug 615594) (diff) | |
| download | portage-7e50a057.tar.gz portage-7e50a057.tar.bz2 portage-7e50a057.zip | |
UserWarning if /etc/portage/package.keywords exists
The /etc/portage/package.keywords file has been long deprecated
in favor of /etc/portage/package.accept_keywords. The file would
be useful if we could make it behave like package.keywords in
profiles (see bug 491166), but it's safest if we trigger a
UserWarning for some time before we change the meaning in a
future version of portage. The message looks like this:
UserWarning: /etc/portage/package.keywords is deprecated, use /etc/portage/package.accept_keywords instead
Bug: https://bugs.gentoo.org/491166
Bug: https://bugs.gentoo.org/607852
Signed-off-by: Zac Medico <zmedico@gentoo.org>
| -rw-r--r-- | lib/portage/package/ebuild/_config/KeywordsManager.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lib/portage/package/ebuild/_config/KeywordsManager.py b/lib/portage/package/ebuild/_config/KeywordsManager.py index fd0a6318d..1c12ce58e 100644 --- a/lib/portage/package/ebuild/_config/KeywordsManager.py +++ b/lib/portage/package/ebuild/_config/KeywordsManager.py @@ -5,6 +5,8 @@ __all__ = ( 'KeywordsManager', ) +import warnings + from _emerge.Package import Package from portage import os from portage.dep import ExtendedAtomDict, _repo_separator, _slot_separator @@ -54,13 +56,20 @@ class KeywordsManager(object): self.pkeywordsdict = ExtendedAtomDict(dict) if user_config: + user_accept_kwrds_path = os.path.join(abs_user_config, "package.accept_keywords") + user_kwrds_path = os.path.join(abs_user_config, "package.keywords") pkgdict = grabdict_package( - os.path.join(abs_user_config, "package.keywords"), + user_kwrds_path, recursive=1, allow_wildcard=True, allow_repo=True, verify_eapi=False, allow_build_id=True) + if pkgdict: + warnings.warn(_("%s is deprecated, use %s instead") % + (user_kwrds_path, user_accept_kwrds_path), + UserWarning) + for k, v in grabdict_package( - os.path.join(abs_user_config, "package.accept_keywords"), + user_accept_kwrds_path, recursive=1, allow_wildcard=True, allow_repo=True, verify_eapi=False, allow_build_id=True).items(): pkgdict.setdefault(k, []).extend(v) |