summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-10-18 04:16:05 +0000
committerZac Medico <zmedico@gentoo.org>2009-10-18 04:16:05 +0000
commit2de294f1e5577baf698840a623657619e389f327 (patch)
tree75907baaaad7ba66ad04a4a27709968605697eb5
parent79cb3c8f12dc1d114a81fa01add441416d7c7f02 (diff)
downloadportage-2de294f1e5577baf698840a623657619e389f327.tar.gz
portage-2de294f1e5577baf698840a623657619e389f327.tar.bz2
portage-2de294f1e5577baf698840a623657619e389f327.zip
Ind SetConfig.getSetAtoms(), don't assume the set has a 'creator' attribute,
since if sets.conf is corrupt then emerge generates fallback sets without the 'creator' attribute. svn path=/main/trunk/; revision=14660
-rw-r--r--pym/portage/sets/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 01ce66055..ab67642b8 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -161,7 +161,10 @@ class SetConfig(object):
if ignorelist is None:
ignorelist = set()
- if not setname in ignorelist:
+
+ # If sets.conf is corrupt then emerge generates
+ # fallback sets without the 'creator' attribute.
+ if setname not in ignorelist and hasattr(myset, 'creator'):
if parser.has_option(myset.creator, "extend"):
extend.update(parser.get(myset.creator, "extend").split())
if parser.has_option(myset.creator, "remove"):