Signed-off-by: Aaron Bauman <b...@gentoo.org> --- lib/portage/_sets/dbapi.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/lib/portage/_sets/dbapi.py b/lib/portage/_sets/dbapi.py index a9e1b6880..15d1c3786 100644 --- a/lib/portage/_sets/dbapi.py +++ b/lib/portage/_sets/dbapi.py @@ -1,4 +1,4 @@ -# Copyright 2007-2019 Gentoo Authors +# Copyright 2007-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from __future__ import division @@ -48,7 +48,7 @@ class EverythingSet(PackageSet): myatoms.append(atom) self._setAtoms(myatoms) - + def singleBuilder(self, options, settings, trees): return EverythingSet(trees["vartree"].dbapi) singleBuilder = classmethod(singleBuilder) @@ -156,7 +156,7 @@ class VariableSet(EverythingSet): if not (includes or excludes): raise SetConfigError(_("no includes or excludes given")) - + metadatadb = options.get("metadata-source", "vartree") if not metadatadb in trees: raise SetConfigError(_("invalid value '%s' for option metadata-source") % metadatadb) @@ -266,7 +266,7 @@ class UnavailableBinaries(EverythingSet): class CategorySet(PackageSet): _operations = ["merge", "unmerge"] - + def __init__(self, category, dbapi, only_visible=True): super(CategorySet, self).__init__() self._db = dbapi @@ -277,7 +277,7 @@ class CategorySet(PackageSet): else: s="all" self.description = "Package set containing %s packages of category %s" % (s, self._category) - + def load(self): myatoms = [] for cp in self._db.cp_all(): @@ -285,7 +285,7 @@ class CategorySet(PackageSet): if (not self._check) or len(self._db.match(cp)) > 0: myatoms.append(cp) self._setAtoms(myatoms) - + def _builderGetRepository(cls, options, repositories): repository = options.get("repository", "porttree") if not repository in repositories: @@ -296,7 +296,7 @@ class CategorySet(PackageSet): def _builderGetVisible(cls, options): return get_boolean(options, "only_visible", True) _builderGetVisible = classmethod(_builderGetVisible) - + def singleBuilder(cls, options, settings, trees): if not "category" in options: raise SetConfigError(_("no category given")) @@ -307,13 +307,13 @@ class CategorySet(PackageSet): repository = cls._builderGetRepository(options, trees.keys()) visible = cls._builderGetVisible(options) - + return CategorySet(category, dbapi=trees[repository].dbapi, only_visible=visible) singleBuilder = classmethod(singleBuilder) def multiBuilder(cls, options, settings, trees): rValue = {} - + if "categories" in options: categories = options["categories"].split() invalid = set(categories).difference(settings.categories) @@ -321,14 +321,14 @@ class CategorySet(PackageSet): raise SetConfigError(_("invalid categories: %s") % ", ".join(list(invalid))) else: categories = settings.categories - + repository = cls._builderGetRepository(options, trees.keys()) visible = cls._builderGetVisible(options) name_pattern = options.get("name_pattern", "$category/*") - + if not "$category" in name_pattern and not "${category}" in name_pattern: raise SetConfigError(_("name_pattern doesn't include $category placeholder")) - + for cat in categories: myset = CategorySet(cat, trees[repository].dbapi, only_visible=visible) myname = name_pattern.replace("$category", cat) @@ -347,7 +347,7 @@ class AgeSet(EverythingSet): self._age = age def _filter(self, atom): - + cpv = self._db.match(atom)[0] try: date, = self._db.aux_get(cpv, self._aux_keys) @@ -359,7 +359,7 @@ class AgeSet(EverythingSet): or (self._mode == "newer" and age >= self._age)): return False return True - + def singleBuilder(cls, options, settings, trees): mode = options.get("mode", "older") if str(mode).lower() not in ["newer", "older"]: -- 2.28.0