diff options
Diffstat (limited to 'pym/portage/sets/__init__.py')
-rw-r--r-- | pym/portage/sets/__init__.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index dc281dea3..ac3f4b0cb 100644 --- a/pym/portage/sets/__init__.py +++ b/pym/portage/sets/__init__.py @@ -179,6 +179,8 @@ class SetConfig(SafeConfigParser): self.trees = trees self.settings = settings self._parsed = False + self.active = [] + self.aliases = {} def _parse(self): if self._parsed: @@ -230,20 +232,22 @@ class SetConfig(SafeConfigParser): def getSets(self): self._parse() - return (self.psets, self.errors) + return self.psets def getSetsWithAliases(self): self._parse() - shortnames = {} - for name in self.psets: - mysplit = name.split("/") - if len(mysplit) > 1 and mysplit[0] == "sets" and mysplit[-1] != "": - if mysplit[-1] in shortnames: - del shortnames[mysplit[-1]] - else: - shortnames[mysplit[-1]] = self.psets[name] - shortnames.update(self.psets) - return (shortnames, self.errors) + if not self.aliases: + shortnames = {} + for name in self.psets: + mysplit = name.split("/") + if len(mysplit) > 1 and mysplit[0] == "sets" and mysplit[-1] != "": + if mysplit[-1] in shortnames: + del shortnames[mysplit[-1]] + else: + shortnames[mysplit[-1]] = self.psets[name] + shortnames.update(self.psets) + self.aliases = shortnames + return self.aliases def make_default_config(settings, trees): sc = SetConfig([], settings, trees) |