diff options
| author |   lihan <tclh123@gmail.com> | 2017-08-04 16:32:17 +0800 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2017-08-05 13:21:14 -0700 |
| commit | 9c819f72399d4fdae731883d9d915aa824d30fcc (patch) | |
| tree | c78abd8d897d8ac354dc3d958db973bbb466ff02 | |
| parent | make.globals: Enable FEATURES=multilib-strict by default (diff) | |
| download | portage-9c819f72399d4fdae731883d9d915aa824d30fcc.tar.gz portage-9c819f72399d4fdae731883d9d915aa824d30fcc.tar.bz2 portage-9c819f72399d4fdae731883d9d915aa824d30fcc.zip | |
config: allow_build_id=True for user config keywords and use
Fixes: c6e3af2b1e41 ("binpkg-multi-instance 7 of 7")
Closes: https://github.com/gentoo/portage/pull/185
| -rw-r--r-- | pym/portage/package/ebuild/_config/KeywordsManager.py | 4 | ||||
| -rw-r--r-- | pym/portage/package/ebuild/_config/UseManager.py | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py index a4ffb623e..fd0a6318d 100644 --- a/pym/portage/package/ebuild/_config/KeywordsManager.py +++ b/pym/portage/package/ebuild/_config/KeywordsManager.py @@ -57,12 +57,12 @@ class KeywordsManager(object): pkgdict = grabdict_package( os.path.join(abs_user_config, "package.keywords"), recursive=1, allow_wildcard=True, allow_repo=True, - verify_eapi=False) + verify_eapi=False, allow_build_id=True) for k, v in grabdict_package( os.path.join(abs_user_config, "package.accept_keywords"), recursive=1, allow_wildcard=True, allow_repo=True, - verify_eapi=False).items(): + verify_eapi=False, allow_build_id=True).items(): pkgdict.setdefault(k, []).extend(v) accept_keywords_defaults = global_accept_keywords.split() diff --git a/pym/portage/package/ebuild/_config/UseManager.py b/pym/portage/package/ebuild/_config/UseManager.py index 604180214..9ebd0f3ab 100644 --- a/pym/portage/package/ebuild/_config/UseManager.py +++ b/pym/portage/package/ebuild/_config/UseManager.py @@ -239,7 +239,10 @@ class UseManager(object): ret = ExtendedAtomDict(dict) if user_config: pusedict = grabdict_package( - os.path.join(location, file_name), recursive=1, newlines=1, allow_wildcard=True, allow_repo=True, verify_eapi=False) + os.path.join(location, file_name), + recursive=1, newlines=1, allow_wildcard=True, + allow_repo=True, verify_eapi=False, + allow_build_id=True) for k, v in pusedict.items(): l = [] use_expand_prefix = '' |