diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-15 20:46:39 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-15 20:46:39 -0700 |
| commit | 39020a6a418c0910b372e04a8f4959ce258d1989 (patch) | |
| tree | 27f5b95721239b6784a507ab8cb5510bb84a638a /pym | |
| parent | 3158c7762983e54bf83061d5fd6f3b656fb0c10a (diff) | |
| download | portage-39020a6a418c0910b372e04a8f4959ce258d1989.tar.gz portage-39020a6a418c0910b372e04a8f4959ce258d1989.tar.bz2 portage-39020a6a418c0910b372e04a8f4959ce258d1989.zip | |
Add support for /etc/portage/package.accept_keywords. If both
package.accept_keywords and package.keywords are present, both
of them will be used, and values from package.accept_keywords
will override values from package.keywords. The
package.accept_keywords file is intended to replace the
package.keywords file, since profiles support a different form
of package.keywords which modifies effective KEYWORDS (rather
than ACCEPT_KEYWORDS). Note that bug #292083 requests support
for package.accept_keywords in profiles.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/package/ebuild/config.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 23280d6f3..640a244f2 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -851,10 +851,16 @@ class config(object): for k, v in pusedict.items(): self.pusedict.setdefault(k.cp, {})[k] = v - #package.keywords + # package.accept_keywords and package.keywords pkgdict = grabdict_package( os.path.join(abs_user_config, "package.keywords"), recursive=1, allow_wildcard=True) + + for k, v in grabdict_package( + os.path.join(abs_user_config, "package.accept_keywords"), + recursive=1, allow_wildcard=True).items(): + pkgdict.setdefault(k, []).extend(v) + for k, v in pkgdict.items(): # default to ~arch if no specific keyword is given if not v: |