From 2de294f1e5577baf698840a623657619e389f327 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 18 Oct 2009 04:16:05 +0000 Subject: 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 --- pym/portage/sets/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'pym') 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"): -- cgit v1.2.3-1-g7c22