diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-10-18 20:41:30 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-18 20:41:30 +0000 |
| commit | f2e3f317c18b82175c91b86b29fe1b253811faec (patch) | |
| tree | 77f0283e01120ece5dab3b0aba09459113797b91 | |
| parent | Add a boolean expand_nested_sets parameter to SetConfig.getSetAtoms(). This (diff) | |
| download | portage-f2e3f317c18b82175c91b86b29fe1b253811faec.tar.gz portage-f2e3f317c18b82175c91b86b29fe1b253811faec.tar.bz2 portage-f2e3f317c18b82175c91b86b29fe1b253811faec.zip | |
Revert r14677 since it doesn't interact well with the 'extend', 'remove', and
'intersect' code in SetConfig.getSetAtoms().
svn path=/main/trunk/; revision=14678
| -rw-r--r-- | pym/portage/sets/__init__.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index 1adcacadb..bb59bd542 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -144,7 +144,7 @@ class SetConfig(object): self._parse() return self.psets.copy() - def getSetAtoms(self, setname, ignorelist=None, expand_nested_sets=True): + def getSetAtoms(self, setname, ignorelist=None): """ This raises PackageSetNotFound if the give setname does not exist. """ @@ -173,15 +173,13 @@ class SetConfig(object): intersect.update(parser.get(myset.creator, "intersect").split()) ignorelist.add(setname) - - if expand_nested_sets: - for n in myset.getNonAtoms(): - if n.startswith(SETPREFIX): - s = n[len(SETPREFIX):] - if s in self.psets: - extend.add(n[len(SETPREFIX):]) - else: - raise PackageSetNotFound(s) + for n in myset.getNonAtoms(): + if n.startswith(SETPREFIX): + s = n[len(SETPREFIX):] + if s in self.psets: + extend.add(n[len(SETPREFIX):]) + else: + raise PackageSetNotFound(s) for s in ignorelist: extend.discard(s) @@ -189,14 +187,11 @@ class SetConfig(object): intersect.discard(s) for s in extend: - myatoms.update(self.getSetAtoms(s, - ignorelist=ignorelist, expand_nested_sets=expand_nested_sets)) + myatoms.update(self.getSetAtoms(s, ignorelist=ignorelist)) for s in remove: - myatoms.difference_update(self.getSetAtoms(s, - ignorelist=ignorelist, expand_nested_sets=expand_nested_sets)) + myatoms.difference_update(self.getSetAtoms(s, ignorelist=ignorelist)) for s in intersect: - myatoms.intersection_update(self.getSetAtoms(s, - ignorelist=ignorelist, expand_nested_sets=expand_nested_sets)) + myatoms.intersection_update(self.getSetAtoms(s, ignorelist=ignorelist)) return myatoms |