| 1 |
commit: af5b57ee4d3133d9a8ca2c16aa21b7176026c8cd |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 28 05:01:27 2020 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 28 05:02:36 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=af5b57ee |
| 7 |
|
| 8 |
Suppress /etc/portage/package.keywords warning for API consumers |
| 9 |
|
| 10 |
Suggested-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 11 |
Bug: https://bugs.gentoo.org/706298 |
| 12 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 13 |
|
| 14 |
lib/portage/package/ebuild/_config/KeywordsManager.py | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/lib/portage/package/ebuild/_config/KeywordsManager.py b/lib/portage/package/ebuild/_config/KeywordsManager.py |
| 18 |
index 1c12ce58e..48397b022 100644 |
| 19 |
--- a/lib/portage/package/ebuild/_config/KeywordsManager.py |
| 20 |
+++ b/lib/portage/package/ebuild/_config/KeywordsManager.py |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 2010-2014 Gentoo Foundation |
| 23 |
+# Copyright 2010-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
__all__ = ( |
| 27 |
@@ -8,6 +8,7 @@ __all__ = ( |
| 28 |
import warnings |
| 29 |
|
| 30 |
from _emerge.Package import Package |
| 31 |
+import portage |
| 32 |
from portage import os |
| 33 |
from portage.dep import ExtendedAtomDict, _repo_separator, _slot_separator |
| 34 |
from portage.localization import _ |
| 35 |
@@ -63,7 +64,7 @@ class KeywordsManager(object): |
| 36 |
recursive=1, allow_wildcard=True, allow_repo=True, |
| 37 |
verify_eapi=False, allow_build_id=True) |
| 38 |
|
| 39 |
- if pkgdict: |
| 40 |
+ if pkgdict and portage._internal_caller: |
| 41 |
warnings.warn(_("%s is deprecated, use %s instead") % |
| 42 |
(user_kwrds_path, user_accept_kwrds_path), |
| 43 |
UserWarning) |
Archives