| 1 |
commit: 9c819f72399d4fdae731883d9d915aa824d30fcc |
| 2 |
Author: lihan <tclh123 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Aug 4 08:32:17 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 5 20:21:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9c819f72 |
| 7 |
|
| 8 |
config: allow_build_id=True for user config keywords and use |
| 9 |
|
| 10 |
Fixes: c6e3af2b1e41 ("binpkg-multi-instance 7 of 7") |
| 11 |
Closes: https://github.com/gentoo/portage/pull/185 |
| 12 |
|
| 13 |
pym/portage/package/ebuild/_config/KeywordsManager.py | 4 ++-- |
| 14 |
pym/portage/package/ebuild/_config/UseManager.py | 5 ++++- |
| 15 |
2 files changed, 6 insertions(+), 3 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py |
| 18 |
index a4ffb623e..fd0a6318d 100644 |
| 19 |
--- a/pym/portage/package/ebuild/_config/KeywordsManager.py |
| 20 |
+++ b/pym/portage/package/ebuild/_config/KeywordsManager.py |
| 21 |
@@ -57,12 +57,12 @@ class KeywordsManager(object): |
| 22 |
pkgdict = grabdict_package( |
| 23 |
os.path.join(abs_user_config, "package.keywords"), |
| 24 |
recursive=1, allow_wildcard=True, allow_repo=True, |
| 25 |
- verify_eapi=False) |
| 26 |
+ verify_eapi=False, allow_build_id=True) |
| 27 |
|
| 28 |
for k, v in grabdict_package( |
| 29 |
os.path.join(abs_user_config, "package.accept_keywords"), |
| 30 |
recursive=1, allow_wildcard=True, allow_repo=True, |
| 31 |
- verify_eapi=False).items(): |
| 32 |
+ verify_eapi=False, allow_build_id=True).items(): |
| 33 |
pkgdict.setdefault(k, []).extend(v) |
| 34 |
|
| 35 |
accept_keywords_defaults = global_accept_keywords.split() |
| 36 |
|
| 37 |
diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py |
| 38 |
index 604180214..9ebd0f3ab 100644 |
| 39 |
--- a/pym/portage/package/ebuild/_config/UseManager.py |
| 40 |
+++ b/pym/portage/package/ebuild/_config/UseManager.py |
| 41 |
@@ -239,7 +239,10 @@ class UseManager(object): |
| 42 |
ret = ExtendedAtomDict(dict) |
| 43 |
if user_config: |
| 44 |
pusedict = grabdict_package( |
| 45 |
- os.path.join(location, file_name), recursive=1, newlines=1, allow_wildcard=True, allow_repo=True, verify_eapi=False) |
| 46 |
+ os.path.join(location, file_name), |
| 47 |
+ recursive=1, newlines=1, allow_wildcard=True, |
| 48 |
+ allow_repo=True, verify_eapi=False, |
| 49 |
+ allow_build_id=True) |
| 50 |
for k, v in pusedict.items(): |
| 51 |
l = [] |
| 52 |
use_expand_prefix = '' |
Archives