break potential cycles in set expansion

svn path=/main/trunk/; revision=8303

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 1d39d10ee0246879c2a340257909592bdc84807b..315747f10e6256219b972b0264ea49cefafbfd81 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -94,12 +94,14 @@ class SetConfig(SafeConfigParser):
                        self.aliases = shortnames
                return self.aliases
 
-       def getSetAtoms(self, setname):
+       def getSetAtoms(self, setname, ignorelist=[]):
                myset = self.getSetsWithAliases()[setname]
                myatoms = myset.getAtoms()
+               ignorelist.append(setname)
                for n in myset.getNonAtoms():
                        if n[0] == SETPREFIX and n[1:] in self.aliases:
-                               myatoms.update(self.getSetAtoms(n))
+                               if n[1:] not in ignorelist:
+                                       myatoms.update(self.getSetAtoms(n), ignorelist=ignorelist)
                return myatoms
 
 def make_default_config(settings, trees):