From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 18 Oct 2009 04:17:54 +0000 (-0000)
Subject: In SetConfig.getSetAtoms(), don't assume the set has a 'creator' attribute,
X-Git-Tag: v2.1.7.2~32
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=aa88956c2ee87f3b56b12fe891b94c0b79d068d2;p=portage.git

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
---

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"):