Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/
Date: Sun, 25 Sep 2022 19:12:35
Message-Id: 1664132872.a83507be7ce04d3ac421f9cbe8b63816809b0f4e.floppym@gentoo
1 commit: a83507be7ce04d3ac421f9cbe8b63816809b0f4e
2 Author: David Palao <david.palao <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 23 13:42:33 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 25 19:07:52 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a83507be
7
8 chore(bintree): removed useless ``if True:``
9
10 This commit de-indents a large block.
11
12 Signed-off-by: David Palao <david.palao <AT> gmail.com>
13 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
14
15 lib/portage/dbapi/bintree.py | 263 +++++++++++++++++++++----------------------
16 1 file changed, 131 insertions(+), 132 deletions(-)
17
18 diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py
19 index 7f5dc051c..28b3c481b 100644
20 --- a/lib/portage/dbapi/bintree.py
21 +++ b/lib/portage/dbapi/bintree.py
22 @@ -473,143 +473,142 @@ class binarytree:
23 stacklevel=2,
24 )
25
26 - if True:
27 - self.pkgdir = normalize_path(pkgdir)
28 - # NOTE: Event if binpkg-multi-instance is disabled, it's
29 - # still possible to access a PKGDIR which uses the
30 - # binpkg-multi-instance layout (or mixed layout).
31 - self._multi_instance = "binpkg-multi-instance" in settings.features
32 - if self._multi_instance:
33 - self._allocate_filename = self._allocate_filename_multi
34 - self.dbapi = bindbapi(self, settings=settings)
35 - self.update_ents = self.dbapi.update_ents
36 - self.move_slot_ent = self.dbapi.move_slot_ent
37 - self.populated = 0
38 - self.tree = {}
39 - self._binrepos_conf = None
40 - self._remote_has_index = False
41 - self._remotepkgs = None # remote metadata indexed by cpv
42 - self._additional_pkgs = {}
43 - self.invalids = []
44 - self.settings = settings
45 - self._pkg_paths = {}
46 - self._populating = False
47 - self._all_directory = os.path.isdir(os.path.join(self.pkgdir, "All"))
48 - self._pkgindex_version = 0
49 - self._pkgindex_hashes = ["MD5", "SHA1"]
50 - self._pkgindex_file = os.path.join(self.pkgdir, "Packages")
51 - self._pkgindex_keys = self.dbapi._aux_cache_keys.copy()
52 - self._pkgindex_keys.update(["CPV", "SIZE"])
53 - self._pkgindex_aux_keys = [
54 - "BASE_URI",
55 - "BDEPEND",
56 + self.pkgdir = normalize_path(pkgdir)
57 + # NOTE: Event if binpkg-multi-instance is disabled, it's
58 + # still possible to access a PKGDIR which uses the
59 + # binpkg-multi-instance layout (or mixed layout).
60 + self._multi_instance = "binpkg-multi-instance" in settings.features
61 + if self._multi_instance:
62 + self._allocate_filename = self._allocate_filename_multi
63 + self.dbapi = bindbapi(self, settings=settings)
64 + self.update_ents = self.dbapi.update_ents
65 + self.move_slot_ent = self.dbapi.move_slot_ent
66 + self.populated = 0
67 + self.tree = {}
68 + self._binrepos_conf = None
69 + self._remote_has_index = False
70 + self._remotepkgs = None # remote metadata indexed by cpv
71 + self._additional_pkgs = {}
72 + self.invalids = []
73 + self.settings = settings
74 + self._pkg_paths = {}
75 + self._populating = False
76 + self._all_directory = os.path.isdir(os.path.join(self.pkgdir, "All"))
77 + self._pkgindex_version = 0
78 + self._pkgindex_hashes = ["MD5", "SHA1"]
79 + self._pkgindex_file = os.path.join(self.pkgdir, "Packages")
80 + self._pkgindex_keys = self.dbapi._aux_cache_keys.copy()
81 + self._pkgindex_keys.update(["CPV", "SIZE"])
82 + self._pkgindex_aux_keys = [
83 + "BASE_URI",
84 + "BDEPEND",
85 + "BINPKG_FORMAT",
86 + "BUILD_ID",
87 + "BUILD_TIME",
88 + "CHOST",
89 + "DEFINED_PHASES",
90 + "DEPEND",
91 + "DESCRIPTION",
92 + "EAPI",
93 + "FETCHCOMMAND",
94 + "IDEPEND",
95 + "IUSE",
96 + "KEYWORDS",
97 + "LICENSE",
98 + "PDEPEND",
99 + "PKGINDEX_URI",
100 + "PROPERTIES",
101 + "PROVIDES",
102 + "RDEPEND",
103 + "repository",
104 + "REQUIRES",
105 + "RESTRICT",
106 + "RESUMECOMMAND",
107 + "SIZE",
108 + "SLOT",
109 + "USE",
110 + ]
111 + self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
112 + self._pkgindex_use_evaluated_keys = (
113 + "BDEPEND",
114 + "DEPEND",
115 + "IDEPEND",
116 + "LICENSE",
117 + "RDEPEND",
118 + "PDEPEND",
119 + "PROPERTIES",
120 + "RESTRICT",
121 + )
122 + self._pkgindex_header = None
123 + self._pkgindex_header_keys = set(
124 + [
125 + "ACCEPT_KEYWORDS",
126 + "ACCEPT_LICENSE",
127 + "ACCEPT_PROPERTIES",
128 + "ACCEPT_RESTRICT",
129 "BINPKG_FORMAT",
130 - "BUILD_ID",
131 - "BUILD_TIME",
132 - "CHOST",
133 - "DEFINED_PHASES",
134 - "DEPEND",
135 - "DESCRIPTION",
136 - "EAPI",
137 - "FETCHCOMMAND",
138 - "IDEPEND",
139 - "IUSE",
140 - "KEYWORDS",
141 - "LICENSE",
142 - "PDEPEND",
143 - "PKGINDEX_URI",
144 - "PROPERTIES",
145 - "PROVIDES",
146 - "RDEPEND",
147 - "repository",
148 - "REQUIRES",
149 - "RESTRICT",
150 - "RESUMECOMMAND",
151 - "SIZE",
152 - "SLOT",
153 + "CBUILD",
154 + "CONFIG_PROTECT",
155 + "CONFIG_PROTECT_MASK",
156 + "FEATURES",
157 + "GENTOO_MIRRORS",
158 + "INSTALL_MASK",
159 + "IUSE_IMPLICIT",
160 "USE",
161 + "USE_EXPAND",
162 + "USE_EXPAND_HIDDEN",
163 + "USE_EXPAND_IMPLICIT",
164 + "USE_EXPAND_UNPREFIXED",
165 ]
166 - self._pkgindex_aux_keys = list(self._pkgindex_aux_keys)
167 - self._pkgindex_use_evaluated_keys = (
168 - "BDEPEND",
169 - "DEPEND",
170 - "IDEPEND",
171 - "LICENSE",
172 - "RDEPEND",
173 - "PDEPEND",
174 - "PROPERTIES",
175 - "RESTRICT",
176 - )
177 - self._pkgindex_header = None
178 - self._pkgindex_header_keys = set(
179 - [
180 - "ACCEPT_KEYWORDS",
181 - "ACCEPT_LICENSE",
182 - "ACCEPT_PROPERTIES",
183 - "ACCEPT_RESTRICT",
184 - "BINPKG_FORMAT",
185 - "CBUILD",
186 - "CONFIG_PROTECT",
187 - "CONFIG_PROTECT_MASK",
188 - "FEATURES",
189 - "GENTOO_MIRRORS",
190 - "INSTALL_MASK",
191 - "IUSE_IMPLICIT",
192 - "USE",
193 - "USE_EXPAND",
194 - "USE_EXPAND_HIDDEN",
195 - "USE_EXPAND_IMPLICIT",
196 - "USE_EXPAND_UNPREFIXED",
197 - ]
198 - )
199 - self._pkgindex_default_pkg_data = {
200 - "BDEPEND": "",
201 - "BUILD_ID": "",
202 - "BUILD_TIME": "",
203 - "DEFINED_PHASES": "",
204 - "DEPEND": "",
205 - "EAPI": "0",
206 - "IDEPEND": "",
207 - "IUSE": "",
208 - "KEYWORDS": "",
209 - "LICENSE": "",
210 - "PATH": "",
211 - "PDEPEND": "",
212 - "PROPERTIES": "",
213 - "PROVIDES": "",
214 - "RDEPEND": "",
215 - "REQUIRES": "",
216 - "RESTRICT": "",
217 - "SLOT": "0",
218 - "USE": "",
219 - }
220 - self._pkgindex_inherited_keys = ["BINPKG_FORMAT", "CHOST", "repository"]
221 -
222 - # Populate the header with appropriate defaults.
223 - self._pkgindex_default_header_data = {
224 - "BINPKG_FORMAT": self.settings.get(
225 - "BINPKG_FORMAT", SUPPORTED_GENTOO_BINPKG_FORMATS[0]
226 - ),
227 - "CHOST": self.settings.get("CHOST", ""),
228 - "repository": "",
229 - }
230 -
231 - self._pkgindex_translated_keys = (
232 - ("DESCRIPTION", "DESC"),
233 - ("_mtime_", "MTIME"),
234 - ("repository", "REPO"),
235 - )
236 + )
237 + self._pkgindex_default_pkg_data = {
238 + "BDEPEND": "",
239 + "BUILD_ID": "",
240 + "BUILD_TIME": "",
241 + "DEFINED_PHASES": "",
242 + "DEPEND": "",
243 + "EAPI": "0",
244 + "IDEPEND": "",
245 + "IUSE": "",
246 + "KEYWORDS": "",
247 + "LICENSE": "",
248 + "PATH": "",
249 + "PDEPEND": "",
250 + "PROPERTIES": "",
251 + "PROVIDES": "",
252 + "RDEPEND": "",
253 + "REQUIRES": "",
254 + "RESTRICT": "",
255 + "SLOT": "0",
256 + "USE": "",
257 + }
258 + self._pkgindex_inherited_keys = ["BINPKG_FORMAT", "CHOST", "repository"]
259 +
260 + # Populate the header with appropriate defaults.
261 + self._pkgindex_default_header_data = {
262 + "BINPKG_FORMAT": self.settings.get(
263 + "BINPKG_FORMAT", SUPPORTED_GENTOO_BINPKG_FORMATS[0]
264 + ),
265 + "CHOST": self.settings.get("CHOST", ""),
266 + "repository": "",
267 + }
268 +
269 + self._pkgindex_translated_keys = (
270 + ("DESCRIPTION", "DESC"),
271 + ("_mtime_", "MTIME"),
272 + ("repository", "REPO"),
273 + )
274
275 - self._pkgindex_allowed_pkg_keys = set(
276 - chain(
277 - self._pkgindex_keys,
278 - self._pkgindex_aux_keys,
279 - self._pkgindex_hashes,
280 - self._pkgindex_default_pkg_data,
281 - self._pkgindex_inherited_keys,
282 - chain(*self._pkgindex_translated_keys),
283 - )
284 + self._pkgindex_allowed_pkg_keys = set(
285 + chain(
286 + self._pkgindex_keys,
287 + self._pkgindex_aux_keys,
288 + self._pkgindex_hashes,
289 + self._pkgindex_default_pkg_data,
290 + self._pkgindex_inherited_keys,
291 + chain(*self._pkgindex_translated_keys),
292 )
293 + )
294
295 @property
296 def root(self):
Report Message
Find on MARC Find on Google Groups