summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-08-21 12:58:50 -0700
committerZac Medico <zmedico@gentoo.org>2010-08-21 12:58:50 -0700
commit4c1c115372c9682df7bb8fb0d7d6e77d6128f39b (patch)
tree2237b57b8bc64899410931c981f7803489b4ce28
parent1b3799269ad8c7ec8f8f307a6e41b5550517a36a (diff)
downloadportage-4c1c115372c9682df7bb8fb0d7d6e77d6128f39b.tar.gz
portage-4c1c115372c9682df7bb8fb0d7d6e77d6128f39b.tar.bz2
portage-4c1c115372c9682df7bb8fb0d7d6e77d6128f39b.zip
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.
-rw-r--r--pym/portage/package/ebuild/config.py7
1 files changed, 7 insertions, 0 deletions
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