From 4c1c115372c9682df7bb8fb0d7d6e77d6128f39b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 21 Aug 2010 12:58:50 -0700 Subject: [PATCH] Omit non-existent files from the config._pkeywords_list stack (stores data for profile package.keywords). This isn't feasible for package.use (among other package.* files such as package.use.mask) since it is stacked in layers with make.defaults USE, and the layer indices need to align. --- pym/portage/package/ebuild/config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 095957918..7a1f640b6 100644 --- a/pym/portage/package/ebuild/config.py +++ b/pym/portage/package/ebuild/config.py @@ -699,6 +699,13 @@ class config(object): os.path.join(x, "package.keywords"), recursive=1) \ for x in self.profiles] for pkeyworddict in rawpkeywords: + if not pkeyworddict: + # Omit non-existent files from the stack. This isn't + # feasible for package.use (among other package.* + # files such as package.use.mask) since it is stacked + # in layers with make.defaults USE, and the layer + # indices need to align. + continue cpdict = {} for k, v in pkeyworddict.items(): cpdict.setdefault(k.cp, {})[k] = v -- 2.26.2