diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-18 04:17:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 04:17:54 +0000 |
| commit | aa88956c2ee87f3b56b12fe891b94c0b79d068d2 (patch) | |
| tree | 7e34662c2e68a90943fded2af6d8f37c25b482f1 | |
| parent | b7bc0be80c741ba8e6f6f2b67e9d18728229baba (diff) | |
| download | portage-aa88956c2ee87f3b56b12fe891b94c0b79d068d2.tar.gz portage-aa88956c2ee87f3b56b12fe891b94c0b79d068d2.tar.bz2 portage-aa88956c2ee87f3b56b12fe891b94c0b79d068d2.zip | |
In 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. (trunk r14660)
svn path=/main/branches/2.1.7/; revision=14661
| -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 9e971451d..3baa6f4cb 100644 --- a/pym/portage/_sets/__init__.py +++ b/pym/portage/_sets/__init__.py @@ -178,7 +178,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"): |