commit:     af5b57ee4d3133d9a8ca2c16aa21b7176026c8cd
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 05:01:27 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 05:02:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=af5b57ee

Suppress /etc/portage/package.keywords warning for API consumers

Suggested-by: Jeroen Roovers <jer <AT> gentoo.org>
Bug: https://bugs.gentoo.org/706298
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/package/ebuild/_config/KeywordsManager.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/portage/package/ebuild/_config/KeywordsManager.py 
b/lib/portage/package/ebuild/_config/KeywordsManager.py
index 1c12ce58e..48397b022 100644
--- a/lib/portage/package/ebuild/_config/KeywordsManager.py
+++ b/lib/portage/package/ebuild/_config/KeywordsManager.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = (
@@ -8,6 +8,7 @@ __all__ = (
 import warnings
 
 from _emerge.Package import Package
+import portage
 from portage import os
 from portage.dep import ExtendedAtomDict, _repo_separator, _slot_separator
 from portage.localization import _
@@ -63,7 +64,7 @@ class KeywordsManager(object):
                                recursive=1, allow_wildcard=True, 
allow_repo=True,
                                verify_eapi=False, allow_build_id=True)
 
-                       if pkgdict:
+                       if pkgdict and portage._internal_caller:
                                warnings.warn(_("%s is deprecated, use %s 
instead") %
                                        (user_kwrds_path, 
user_accept_kwrds_path),
                                        UserWarning)

Reply via email to