diff options
| author | Brian Harring <ferringb@chromium.org> | 2011-10-24 22:41:17 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-25 14:36:43 -0700 |
| commit | e544ee13527a0568de2b556510280ed96fc1b3ff (patch) | |
| tree | 4404d52c862ca169edfea556cbf31eadb7971194 /pym/portage/package/ebuild/_config/KeywordsManager.py | |
| parent | a34ac493d13ba5ad20b07f25f4e4f054e303eecb (diff) | |
| download | portage-e544ee13527a0568de2b556510280ed96fc1b3ff.tar.gz portage-e544ee13527a0568de2b556510280ed96fc1b3ff.tar.bz2 portage-e544ee13527a0568de2b556510280ed96fc1b3ff.zip | |
add profile-formats portage-1 awareness and enforcement
Currently it just spits warnings for implicit portage-1 format usage;
down the line, this will be converted into an explicit error.
For repo's that configure themselves as portage-1 or pms explicitly, enforce
it.
Diffstat (limited to 'pym/portage/package/ebuild/_config/KeywordsManager.py')
| -rw-r--r-- | pym/portage/package/ebuild/_config/KeywordsManager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/_config/KeywordsManager.py b/pym/portage/package/ebuild/_config/KeywordsManager.py index c2b834344..704ddca70 100644 --- a/pym/portage/package/ebuild/_config/KeywordsManager.py +++ b/pym/portage/package/ebuild/_config/KeywordsManager.py @@ -20,7 +20,7 @@ class KeywordsManager(object): global_accept_keywords=""): self._pkeywords_list = [] rawpkeywords = [grabdict_package( - os.path.join(x, "package.keywords"), recursive=1, + os.path.join(x[0], "package.keywords"), recursive=x[1], verify_eapi=True) \ for x in profiles] for pkeyworddict in rawpkeywords: @@ -35,7 +35,7 @@ class KeywordsManager(object): self._p_accept_keywords = [] raw_p_accept_keywords = [grabdict_package( - os.path.join(x, "package.accept_keywords"), recursive=1, + os.path.join(x[0], "package.accept_keywords"), recursive=x[1], verify_eapi=True) \ for x in profiles] for d in raw_p_accept_keywords: |