From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17EC6138359 for ; Mon, 3 Aug 2020 22:45:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BF4F1E0D09; Mon, 3 Aug 2020 22:44:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8B90E0D09 for ; Mon, 3 Aug 2020 22:44:10 +0000 (UTC) From: Aaron Bauman To: gentoo-portage-dev@lists.gentoo.org Cc: Aaron Bauman Subject: [gentoo-portage-dev] [PATCH 30/68] lib/portage/_sets/security.py: fix whitespace Date: Mon, 3 Aug 2020 18:42:49 -0400 Message-Id: <20200803224327.1593726-30-bman@gentoo.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200803224327.1593726-1-bman@gentoo.org> References: <20200803224327.1593726-1-bman@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 318f37d1-3962-4f5b-b535-bdd9e81783a5 X-Archives-Hash: d9ccda8020e12a69e8ab9342e8783804 Signed-off-by: Aaron Bauman --- lib/portage/_sets/security.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/portage/_sets/security.py b/lib/portage/_sets/security.py index f8dbef2be..53ddd15c1 100644 --- a/lib/portage/_sets/security.py +++ b/lib/portage/_sets/security.py @@ -1,4 +1,4 @@ -# Copyright 2007-2012 Gentoo Foundation +# Copyright 2007-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import portage.glsa as glsa @@ -11,9 +11,9 @@ __all__ = ["SecuritySet", "NewGlsaSet", "NewAffectedSet", "AffectedSet"] class SecuritySet(PackageSet): _operations = ["merge"] _skip_applied = False - + description = "package set that includes all packages possibly affected by a GLSA" - + def __init__(self, settings, vardbapi, portdbapi, least_change=True): super(SecuritySet, self).__init__() self._settings = settings @@ -29,7 +29,7 @@ class SecuritySet(PackageSet): glsaindexlist = list(glsaindexlist) glsaindexlist.sort() return glsaindexlist - + def load(self): glsaindexlist = self.getGlsaList(self._skip_applied) atomlist = [] @@ -39,7 +39,7 @@ class SecuritySet(PackageSet): if self.useGlsa(myglsa): atomlist += ["="+x for x in myglsa.getMergeList(least_change=self._least_change)] self._setAtoms(self._reduce(atomlist)) - + def _reduce(self, atomlist): mydict = {} for atom in atomlist[:]: @@ -54,7 +54,7 @@ class SecuritySet(PackageSet): atomlist.remove(mydict[cps][0]) mydict[cps] = (atom, cpv) return atomlist - + def useGlsa(self, myglsa): return True @@ -65,12 +65,12 @@ class SecuritySet(PackageSet): myglsa = glsa.Glsa(glsaid, self._settings, self._vardbapi, self._portdbapi) if not myglsa.isVulnerable() and not myglsa.nr in applied_list: myglsa.inject() - + def singleBuilder(cls, options, settings, trees): least_change = not get_boolean(options, "use_emerge_resolver", False) return cls(settings, trees["vartree"].dbapi, trees["porttree"].dbapi, least_change=least_change) singleBuilder = classmethod(singleBuilder) - + class NewGlsaSet(SecuritySet): _skip_applied = True description = "Package set that includes all packages possibly affected by an unapplied GLSA" -- 2.28.0