From 39020a6a418c0910b372e04a8f4959ce258d1989 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 15 Aug 2010 20:46:39 -0700 Subject: 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. --- pym/portage/package/ebuild/config.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pym') 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: -- cgit v1.2.3-1-g7c22