1 |
Signed-off-by: Aaron Bauman <bman@g.o> |
2 |
--- |
3 |
lib/portage/_sets/security.py | 16 ++++++++-------- |
4 |
1 file changed, 8 insertions(+), 8 deletions(-) |
5 |
|
6 |
diff --git a/lib/portage/_sets/security.py b/lib/portage/_sets/security.py |
7 |
index f8dbef2be..53ddd15c1 100644 |
8 |
--- a/lib/portage/_sets/security.py |
9 |
+++ b/lib/portage/_sets/security.py |
10 |
@@ -1,4 +1,4 @@ |
11 |
-# Copyright 2007-2012 Gentoo Foundation |
12 |
+# Copyright 2007-2020 Gentoo Authors |
13 |
# Distributed under the terms of the GNU General Public License v2 |
14 |
|
15 |
import portage.glsa as glsa |
16 |
@@ -11,9 +11,9 @@ __all__ = ["SecuritySet", "NewGlsaSet", "NewAffectedSet", "AffectedSet"] |
17 |
class SecuritySet(PackageSet): |
18 |
_operations = ["merge"] |
19 |
_skip_applied = False |
20 |
- |
21 |
+ |
22 |
description = "package set that includes all packages possibly affected by a GLSA" |
23 |
- |
24 |
+ |
25 |
def __init__(self, settings, vardbapi, portdbapi, least_change=True): |
26 |
super(SecuritySet, self).__init__() |
27 |
self._settings = settings |
28 |
@@ -29,7 +29,7 @@ class SecuritySet(PackageSet): |
29 |
glsaindexlist = list(glsaindexlist) |
30 |
glsaindexlist.sort() |
31 |
return glsaindexlist |
32 |
- |
33 |
+ |
34 |
def load(self): |
35 |
glsaindexlist = self.getGlsaList(self._skip_applied) |
36 |
atomlist = [] |
37 |
@@ -39,7 +39,7 @@ class SecuritySet(PackageSet): |
38 |
if self.useGlsa(myglsa): |
39 |
atomlist += ["="+x for x in myglsa.getMergeList(least_change=self._least_change)] |
40 |
self._setAtoms(self._reduce(atomlist)) |
41 |
- |
42 |
+ |
43 |
def _reduce(self, atomlist): |
44 |
mydict = {} |
45 |
for atom in atomlist[:]: |
46 |
@@ -54,7 +54,7 @@ class SecuritySet(PackageSet): |
47 |
atomlist.remove(mydict[cps][0]) |
48 |
mydict[cps] = (atom, cpv) |
49 |
return atomlist |
50 |
- |
51 |
+ |
52 |
def useGlsa(self, myglsa): |
53 |
return True |
54 |
|
55 |
@@ -65,12 +65,12 @@ class SecuritySet(PackageSet): |
56 |
myglsa = glsa.Glsa(glsaid, self._settings, self._vardbapi, self._portdbapi) |
57 |
if not myglsa.isVulnerable() and not myglsa.nr in applied_list: |
58 |
myglsa.inject() |
59 |
- |
60 |
+ |
61 |
def singleBuilder(cls, options, settings, trees): |
62 |
least_change = not get_boolean(options, "use_emerge_resolver", False) |
63 |
return cls(settings, trees["vartree"].dbapi, trees["porttree"].dbapi, least_change=least_change) |
64 |
singleBuilder = classmethod(singleBuilder) |
65 |
- |
66 |
+ |
67 |
class NewGlsaSet(SecuritySet): |
68 |
_skip_applied = True |
69 |
description = "Package set that includes all packages possibly affected by an unapplied GLSA" |
70 |
-- |
71 |
2.28.0 |