diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-18 04:16:05 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 04:16:05 +0000 |
| commit | 2de294f1e5577baf698840a623657619e389f327 (patch) | |
| tree | 75907baaaad7ba66ad04a4a27709968605697eb5 | |
| parent | Call config._init_dirs() from emerge so that it's not called every time (diff) | |
| download | portage-multirepo-2de294f1e5577baf698840a623657619e389f327.tar.gz portage-multirepo-2de294f1e5577baf698840a623657619e389f327.tar.bz2 portage-multirepo-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__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index 01ce6605..ab67642b 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"): |