Gentoo Archives: gentoo-portage-dev

From: Aaron Bauman <bman@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Aaron Bauman <bman@g.o>
Subject: [gentoo-portage-dev] [PATCH 17/68] lib/portage/_sets/base.py: fix whitespace
Date: Mon, 03 Aug 2020 22:44:36
Message-Id: 20200803224327.1593726-17-bman@gentoo.org
In Reply to: [gentoo-portage-dev] [PATCH 01/68] lib/portage/util/_dyn_libs/PreservedLibsRegistry.py: fix whitespace by Aaron Bauman
1 Signed-off-by: Aaron Bauman <bman@g.o>
2 ---
3 lib/portage/_sets/base.py | 22 +++++++++++-----------
4 1 file changed, 11 insertions(+), 11 deletions(-)
5
6 diff --git a/lib/portage/_sets/base.py b/lib/portage/_sets/base.py
7 index 06e0a3cd4..f03df0320 100644
8 --- a/lib/portage/_sets/base.py
9 +++ b/lib/portage/_sets/base.py
10 @@ -9,13 +9,13 @@ from portage.versions import cpv_getkey
11 OPERATIONS = ["merge", "unmerge"]
12
13 class PackageSet:
14 - # Set this to operations that are supported by your subclass. While
15 + # Set this to operations that are supported by your subclass. While
16 # technically there is no difference between "merge" and "unmerge" regarding
17 # package sets, the latter doesn't make sense for some sets like "system"
18 # or "security" and therefore isn't supported by them.
19 _operations = ["merge"]
20 description = "generic package set"
21 -
22 +
23 def __init__(self, allow_wildcard=False, allow_repo=False):
24 self._atoms = set()
25 self._atommap = ExtendedAtomDict(set)
26 @@ -30,7 +30,7 @@ class PackageSet:
27 def __contains__(self, atom):
28 self._load()
29 return atom in self._atoms or atom in self._nonatoms
30 -
31 +
32 def __iter__(self):
33 self._load()
34 for x in self._atoms:
35 @@ -96,12 +96,12 @@ class PackageSet:
36 if match_from_list(a, [cpv]):
37 return True
38 return False
39 -
40 +
41 def getMetadata(self, key):
42 if hasattr(self, key.lower()):
43 return getattr(self, key.lower())
44 return ""
45 -
46 +
47 def _updateAtomMap(self, atoms=None):
48 """Update self._atommap for specific atoms or all atoms."""
49 if not atoms:
50 @@ -109,7 +109,7 @@ class PackageSet:
51 atoms = self._atoms
52 for a in atoms:
53 self._atommap.setdefault(a.cp, set()).add(a)
54 -
55 +
56 # Not sure if this one should really be in PackageSet
57 def findAtomForPackage(self, pkg, modified_use=None):
58 """Return the best match for a given package from the arguments, or
59 @@ -154,7 +154,7 @@ class EditablePackageSet(PackageSet):
60
61 def __init__(self, allow_wildcard=False, allow_repo=False):
62 super(EditablePackageSet, self).__init__(allow_wildcard=allow_wildcard, allow_repo=allow_repo)
63 -
64 +
65 def update(self, atoms):
66 self._load()
67 modified = False
68 @@ -179,7 +179,7 @@ class EditablePackageSet(PackageSet):
69 self._updateAtomMap(atoms=normal_atoms)
70 if modified:
71 self.write()
72 -
73 +
74 def add(self, atom):
75 self.update([atom])
76
77 @@ -220,7 +220,7 @@ class InternalPackageSet(EditablePackageSet):
78 def clear(self):
79 self._atoms.clear()
80 self._updateAtomMap()
81 -
82 +
83 def load(self):
84 pass
85
86 @@ -232,10 +232,10 @@ class DummyPackageSet(PackageSet):
87 super(DummyPackageSet, self).__init__()
88 if atoms:
89 self._setAtoms(atoms)
90 -
91 +
92 def load(self):
93 pass
94 -
95 +
96 def singleBuilder(cls, options, settings, trees):
97 atoms = options.get("packages", "").split()
98 return DummyPackageSet(atoms=atoms)
99 --
100 2.28.0