1 |
commit: 854379debaaf30e3dad30974c3d4055a5c75d90b |
2 |
Author: Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Nov 27 05:02:40 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 30 06:01:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=854379de |
7 |
|
8 |
Fix some type errors |
9 |
|
10 |
Knock out some low-hanging fruit given by running |
11 |
|
12 |
mypy --pretty --show-error-context . |
13 |
|
14 |
inside lib/ (191 total errors found). |
15 |
|
16 |
portage/package/ebuild/_config/special_env_vars.py:248: error: Incompatible |
17 |
types in assignment (expression has type "FrozenSet[str]", variable has type |
18 |
"List[str]") [assignment] |
19 |
environ_whitelist = frozenset(environ_whitelist) |
20 |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
21 |
portage/package/ebuild/_config/special_env_vars.py:353: error: Incompatible |
22 |
types in assignment (expression has type "FrozenSet[str]", variable has type |
23 |
"List[str]") [assignment] |
24 |
environ_filter = frozenset(environ_filter) |
25 |
^~~~~~~~~~~~~~~~~~~~~~~~~ |
26 |
portage/checksum.py:342: error: Incompatible types in assignment (expression |
27 |
has type "int", variable has type "bool") [assignment] |
28 |
prelink_capable = 1 |
29 |
^ |
30 |
_emerge/Package.py: note: At top level: |
31 |
_emerge/Package.py:865: error: Incompatible types in assignment (expression has |
32 |
type "FrozenSet[str]", variable has type "Set[str]") [assignment] |
33 |
_all_metadata_keys = frozenset(_all_metadata_keys) |
34 |
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
35 |
portage/getbinpkg.py:46: error: Incompatible types in assignment (expression |
36 |
has type "Tuple[Type[Exception], ...]", variable has type |
37 |
"List[Type[Exception]]") [assignment] |
38 |
_all_errors = tuple(_all_errors) |
39 |
^~~~~~~~~~~~~~~~~~ |
40 |
|
41 |
Signed-off-by: Oskari Pirhonen <xxc3ncoredxx <AT> gmail.com> |
42 |
Closes: https://github.com/gentoo/portage/pull/948 |
43 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
44 |
|
45 |
lib/_emerge/Package.py | 4 +- |
46 |
lib/portage/checksum.py | 2 +- |
47 |
lib/portage/getbinpkg.py | 4 +- |
48 |
.../package/ebuild/_config/special_env_vars.py | 508 ++++++++++----------- |
49 |
4 files changed, 248 insertions(+), 270 deletions(-) |
50 |
|
51 |
diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py |
52 |
index c50349e27..afb69024e 100644 |
53 |
--- a/lib/_emerge/Package.py |
54 |
+++ b/lib/_emerge/Package.py |
55 |
@@ -860,9 +860,7 @@ class Package(Task): |
56 |
return pkg |
57 |
|
58 |
|
59 |
-_all_metadata_keys = set(x for x in portage.auxdbkeys) |
60 |
-_all_metadata_keys.update(Package.metadata_keys) |
61 |
-_all_metadata_keys = frozenset(_all_metadata_keys) |
62 |
+_all_metadata_keys = frozenset(set(portage.auxdbkeys).union(Package.metadata_keys)) |
63 |
|
64 |
_PackageMetadataWrapperBase = slot_dict_class(_all_metadata_keys) |
65 |
|
66 |
|
67 |
diff --git a/lib/portage/checksum.py b/lib/portage/checksum.py |
68 |
index 85cc36af3..7421b1c98 100644 |
69 |
--- a/lib/portage/checksum.py |
70 |
+++ b/lib/portage/checksum.py |
71 |
@@ -339,7 +339,7 @@ if os.path.exists(PRELINK_BINARY): |
72 |
proc.communicate() |
73 |
status = proc.wait() |
74 |
if os.WIFEXITED(status) and os.WEXITSTATUS(status) == os.EX_OK: |
75 |
- prelink_capable = 1 |
76 |
+ prelink_capable = True |
77 |
del cmd, proc, status |
78 |
|
79 |
|
80 |
|
81 |
diff --git a/lib/portage/getbinpkg.py b/lib/portage/getbinpkg.py |
82 |
index 799f5b171..8d06ad862 100644 |
83 |
--- a/lib/portage/getbinpkg.py |
84 |
+++ b/lib/portage/getbinpkg.py |
85 |
@@ -43,8 +43,6 @@ except ImportError as e: |
86 |
else: |
87 |
_all_errors.append(http_client_error) |
88 |
|
89 |
-_all_errors = tuple(_all_errors) |
90 |
- |
91 |
|
92 |
def make_metadata_dict(data): |
93 |
warnings.warn( |
94 |
@@ -615,7 +613,7 @@ def dir_get_metadata( |
95 |
|
96 |
try: |
97 |
conn = create_conn(baseurl, conn)[0] |
98 |
- except _all_errors as e: |
99 |
+ except tuple(_all_errors) as e: |
100 |
# ftplib.FTP(host) can raise errors like this: |
101 |
# socket.error: (111, 'Connection refused') |
102 |
sys.stderr.write("!!! %s\n" % (e,)) |
103 |
|
104 |
diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py |
105 |
index 1de62e421..37fc2a290 100644 |
106 |
--- a/lib/portage/package/ebuild/_config/special_env_vars.py |
107 |
+++ b/lib/portage/package/ebuild/_config/special_env_vars.py |
108 |
@@ -72,8 +72,6 @@ env_blacklist = frozenset( |
109 |
) |
110 |
) |
111 |
|
112 |
-environ_whitelist = [] |
113 |
- |
114 |
# Whitelisted variables are always allowed to enter the ebuild |
115 |
# environment. Generally, this only includes special portage |
116 |
# variables. Ebuilds can unset variables that are not whitelisted |
117 |
@@ -82,275 +80,259 @@ environ_whitelist = [] |
118 |
# important to set our special BASH_ENV variable in the ebuild |
119 |
# environment in order to prevent sandbox from sourcing /etc/profile |
120 |
# in it's bashrc (causing major leakage). |
121 |
-environ_whitelist += [ |
122 |
- "ACCEPT_LICENSE", |
123 |
- "BASH_ENV", |
124 |
- "BASH_FUNC____in_portage_iuse%%", |
125 |
- "BINPKG_FORMAT", |
126 |
- "BROOT", |
127 |
- "BUILD_ID", |
128 |
- "BUILD_PREFIX", |
129 |
- "COLUMNS", |
130 |
- "D", |
131 |
- "DISTDIR", |
132 |
- "DOC_SYMLINKS_DIR", |
133 |
- "EAPI", |
134 |
- "EBUILD", |
135 |
- "EBUILD_FORCE_TEST", |
136 |
- "EBUILD_PHASE", |
137 |
- "EBUILD_PHASE_FUNC", |
138 |
- "ECLASSDIR", |
139 |
- "ECLASS_DEPTH", |
140 |
- "ED", |
141 |
- "EMERGE_FROM", |
142 |
- "ENV_UNSET", |
143 |
- "EPREFIX", |
144 |
- "EROOT", |
145 |
- "ESYSROOT", |
146 |
- "FEATURES", |
147 |
- "FILESDIR", |
148 |
- "HOME", |
149 |
- "MERGE_TYPE", |
150 |
- "NOCOLOR", |
151 |
- "PATH", |
152 |
- "PKGDIR", |
153 |
- "PKGUSE", |
154 |
- "PKG_LOGDIR", |
155 |
- "PKG_TMPDIR", |
156 |
- "PORTAGE_ACTUAL_DISTDIR", |
157 |
- "PORTAGE_ARCHLIST", |
158 |
- "PORTAGE_BASHRC_FILES", |
159 |
- "PORTAGE_BASHRC", |
160 |
- "PM_EBUILD_HOOK_DIR", |
161 |
- "PORTAGE_BINPKG_FILE", |
162 |
- "PORTAGE_BINPKG_TAR_OPTS", |
163 |
- "PORTAGE_BINPKG_TMPFILE", |
164 |
- "PORTAGE_BIN_PATH", |
165 |
- "PORTAGE_BUILDDIR", |
166 |
- "PORTAGE_BUILD_GROUP", |
167 |
- "PORTAGE_BUILD_USER", |
168 |
- "PORTAGE_BUNZIP2_COMMAND", |
169 |
- "PORTAGE_BZIP2_COMMAND", |
170 |
- "PORTAGE_COLORMAP", |
171 |
- "PORTAGE_COMPRESS", |
172 |
- "PORTAGE_COMPRESSION_COMMAND", |
173 |
- "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES", |
174 |
- "PORTAGE_CONFIGROOT", |
175 |
- "PORTAGE_DEBUG", |
176 |
- "PORTAGE_DEPCACHEDIR", |
177 |
- "PORTAGE_DOHTML_UNWARNED_SKIPPED_EXTENSIONS", |
178 |
- "PORTAGE_DOHTML_UNWARNED_SKIPPED_FILES", |
179 |
- "PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES", |
180 |
- "PORTAGE_EBUILD_EXIT_FILE", |
181 |
- "PORTAGE_FEATURES", |
182 |
- "PORTAGE_GID", |
183 |
- "PORTAGE_GRPNAME", |
184 |
- "PORTAGE_INTERNAL_CALLER", |
185 |
- "PORTAGE_INST_GID", |
186 |
- "PORTAGE_INST_UID", |
187 |
- "PORTAGE_IPC_DAEMON", |
188 |
- "PORTAGE_IUSE", |
189 |
- "PORTAGE_ECLASS_LOCATIONS", |
190 |
- "PORTAGE_LOG_FILE", |
191 |
- "PORTAGE_OVERRIDE_EPREFIX", |
192 |
- "PORTAGE_PIPE_FD", |
193 |
- "PORTAGE_PROPERTIES", |
194 |
- "PORTAGE_PYM_PATH", |
195 |
- "PORTAGE_PYTHON", |
196 |
- "PORTAGE_PYTHONPATH", |
197 |
- "PORTAGE_QUIET", |
198 |
- "PORTAGE_REPO_NAME", |
199 |
- "PORTAGE_REPOSITORIES", |
200 |
- "PORTAGE_RESTRICT", |
201 |
- "PORTAGE_SIGPIPE_STATUS", |
202 |
- "PORTAGE_SOCKS5_PROXY", |
203 |
- "PORTAGE_TMPDIR", |
204 |
- "PORTAGE_UPDATE_ENV", |
205 |
- "PORTAGE_USERNAME", |
206 |
- "PORTAGE_VERBOSE", |
207 |
- "PORTAGE_WORKDIR_MODE", |
208 |
- "PORTAGE_XATTR_EXCLUDE", |
209 |
- "PORTDIR", |
210 |
- "PORTDIR_OVERLAY", |
211 |
- "PREROOTPATH", |
212 |
- "PYTHONDONTWRITEBYTECODE", |
213 |
- "REPLACING_VERSIONS", |
214 |
- "REPLACED_BY_VERSION", |
215 |
- "ROOT", |
216 |
- "ROOTPATH", |
217 |
- "SANDBOX_LOG", |
218 |
- "SYSROOT", |
219 |
- "T", |
220 |
- "TMP", |
221 |
- "TMPDIR", |
222 |
- "USE_EXPAND", |
223 |
- "USE_ORDER", |
224 |
- "WORKDIR", |
225 |
- "XARGS", |
226 |
- "__PORTAGE_TEST_HARDLINK_LOCKS", |
227 |
-] |
228 |
- |
229 |
-# user config variables |
230 |
-environ_whitelist += ["DOC_SYMLINKS_DIR", "INSTALL_MASK", "PKG_INSTALL_MASK"] |
231 |
- |
232 |
-environ_whitelist += ["A", "AA", "CATEGORY", "P", "PF", "PN", "PR", "PV", "PVR"] |
233 |
- |
234 |
-# misc variables inherited from the calling environment |
235 |
-environ_whitelist += [ |
236 |
- "COLORTERM", |
237 |
- "DISPLAY", |
238 |
- "EDITOR", |
239 |
- "LESS", |
240 |
- "LESSOPEN", |
241 |
- "LOGNAME", |
242 |
- "LS_COLORS", |
243 |
- "PAGER", |
244 |
- "TERM", |
245 |
- "TERMCAP", |
246 |
- "USER", |
247 |
- "ftp_proxy", |
248 |
- "http_proxy", |
249 |
- "no_proxy", |
250 |
-] |
251 |
- |
252 |
-# tempdir settings |
253 |
-environ_whitelist += [ |
254 |
- "TMPDIR", |
255 |
- "TEMP", |
256 |
- "TMP", |
257 |
-] |
258 |
- |
259 |
-# localization settings |
260 |
-environ_whitelist += [ |
261 |
- "LANG", |
262 |
- "LC_COLLATE", |
263 |
- "LC_CTYPE", |
264 |
- "LC_MESSAGES", |
265 |
- "LC_MONETARY", |
266 |
- "LC_NUMERIC", |
267 |
- "LC_TIME", |
268 |
- "LC_PAPER", |
269 |
- "LC_ALL", |
270 |
-] |
271 |
- |
272 |
-# other variables inherited from the calling environment |
273 |
-environ_whitelist += [ |
274 |
- "CVS_RSH", |
275 |
- "ECHANGELOG_USER", |
276 |
- "GPG_AGENT_INFO", |
277 |
- "SSH_AGENT_PID", |
278 |
- "SSH_AUTH_SOCK", |
279 |
- "STY", |
280 |
- "WINDOW", |
281 |
- "XAUTHORITY", |
282 |
-] |
283 |
- |
284 |
-environ_whitelist = frozenset(environ_whitelist) |
285 |
+environ_whitelist = frozenset( |
286 |
+ ( |
287 |
+ "A", |
288 |
+ "AA", |
289 |
+ "ACCEPT_LICENSE", |
290 |
+ "BASH_ENV", |
291 |
+ "BASH_FUNC____in_portage_iuse%%", |
292 |
+ "BINPKG_FORMAT", |
293 |
+ "BROOT", |
294 |
+ "BUILD_ID", |
295 |
+ "BUILD_PREFIX", |
296 |
+ "CATEGORY", |
297 |
+ "COLUMNS", |
298 |
+ "D", |
299 |
+ "DISTDIR", |
300 |
+ "DOC_SYMLINKS_DIR", |
301 |
+ "EAPI", |
302 |
+ "EBUILD", |
303 |
+ "EBUILD_FORCE_TEST", |
304 |
+ "EBUILD_PHASE", |
305 |
+ "EBUILD_PHASE_FUNC", |
306 |
+ "ECLASSDIR", |
307 |
+ "ECLASS_DEPTH", |
308 |
+ "ED", |
309 |
+ "EMERGE_FROM", |
310 |
+ "ENV_UNSET", |
311 |
+ "EPREFIX", |
312 |
+ "EROOT", |
313 |
+ "ESYSROOT", |
314 |
+ "FEATURES", |
315 |
+ "FILESDIR", |
316 |
+ "HOME", |
317 |
+ "MERGE_TYPE", |
318 |
+ "NOCOLOR", |
319 |
+ "P", |
320 |
+ "PATH", |
321 |
+ "PF", |
322 |
+ "PKGDIR", |
323 |
+ "PKGUSE", |
324 |
+ "PKG_LOGDIR", |
325 |
+ "PKG_TMPDIR", |
326 |
+ "PM_EBUILD_HOOK_DIR", |
327 |
+ "PN", |
328 |
+ "PORTAGE_ACTUAL_DISTDIR", |
329 |
+ "PORTAGE_ARCHLIST", |
330 |
+ "PORTAGE_BASHRC_FILES", |
331 |
+ "PORTAGE_BASHRC", |
332 |
+ "PORTAGE_BINPKG_FILE", |
333 |
+ "PORTAGE_BINPKG_TAR_OPTS", |
334 |
+ "PORTAGE_BINPKG_TMPFILE", |
335 |
+ "PORTAGE_BIN_PATH", |
336 |
+ "PORTAGE_BUILDDIR", |
337 |
+ "PORTAGE_BUILD_GROUP", |
338 |
+ "PORTAGE_BUILD_USER", |
339 |
+ "PORTAGE_BUNZIP2_COMMAND", |
340 |
+ "PORTAGE_BZIP2_COMMAND", |
341 |
+ "PORTAGE_COLORMAP", |
342 |
+ "PORTAGE_COMPRESS", |
343 |
+ "PORTAGE_COMPRESSION_COMMAND", |
344 |
+ "PORTAGE_COMPRESS_EXCLUDE_SUFFIXES", |
345 |
+ "PORTAGE_CONFIGROOT", |
346 |
+ "PORTAGE_DEBUG", |
347 |
+ "PORTAGE_DEPCACHEDIR", |
348 |
+ "PORTAGE_DOHTML_UNWARNED_SKIPPED_EXTENSIONS", |
349 |
+ "PORTAGE_DOHTML_UNWARNED_SKIPPED_FILES", |
350 |
+ "PORTAGE_DOHTML_WARN_ON_SKIPPED_FILES", |
351 |
+ "PORTAGE_EBUILD_EXIT_FILE", |
352 |
+ "PORTAGE_FEATURES", |
353 |
+ "PORTAGE_GID", |
354 |
+ "PORTAGE_GRPNAME", |
355 |
+ "PORTAGE_INTERNAL_CALLER", |
356 |
+ "PORTAGE_INST_GID", |
357 |
+ "PORTAGE_INST_UID", |
358 |
+ "PORTAGE_IPC_DAEMON", |
359 |
+ "PORTAGE_IUSE", |
360 |
+ "PORTAGE_ECLASS_LOCATIONS", |
361 |
+ "PORTAGE_LOG_FILE", |
362 |
+ "PORTAGE_OVERRIDE_EPREFIX", |
363 |
+ "PORTAGE_PIPE_FD", |
364 |
+ "PORTAGE_PROPERTIES", |
365 |
+ "PORTAGE_PYM_PATH", |
366 |
+ "PORTAGE_PYTHON", |
367 |
+ "PORTAGE_PYTHONPATH", |
368 |
+ "PORTAGE_QUIET", |
369 |
+ "PORTAGE_REPO_NAME", |
370 |
+ "PORTAGE_REPOSITORIES", |
371 |
+ "PORTAGE_RESTRICT", |
372 |
+ "PORTAGE_SIGPIPE_STATUS", |
373 |
+ "PORTAGE_SOCKS5_PROXY", |
374 |
+ "PORTAGE_TMPDIR", |
375 |
+ "PORTAGE_UPDATE_ENV", |
376 |
+ "PORTAGE_USERNAME", |
377 |
+ "PORTAGE_VERBOSE", |
378 |
+ "PORTAGE_WORKDIR_MODE", |
379 |
+ "PORTAGE_XATTR_EXCLUDE", |
380 |
+ "PORTDIR", |
381 |
+ "PORTDIR_OVERLAY", |
382 |
+ "PR", |
383 |
+ "PREROOTPATH", |
384 |
+ "PV", |
385 |
+ "PVR", |
386 |
+ "PYTHONDONTWRITEBYTECODE", |
387 |
+ "REPLACING_VERSIONS", |
388 |
+ "REPLACED_BY_VERSION", |
389 |
+ "ROOT", |
390 |
+ "ROOTPATH", |
391 |
+ "SANDBOX_LOG", |
392 |
+ "SYSROOT", |
393 |
+ "T", |
394 |
+ "TMP", |
395 |
+ "TMPDIR", |
396 |
+ "USE_EXPAND", |
397 |
+ "USE_ORDER", |
398 |
+ "WORKDIR", |
399 |
+ "XARGS", |
400 |
+ "__PORTAGE_TEST_HARDLINK_LOCKS", |
401 |
+ # user config variables |
402 |
+ "DOC_SYMLINKS_DIR", |
403 |
+ "INSTALL_MASK", |
404 |
+ "PKG_INSTALL_MASK", |
405 |
+ # misc variables inherited from the calling environment |
406 |
+ "COLORTERM", |
407 |
+ "DISPLAY", |
408 |
+ "EDITOR", |
409 |
+ "LESS", |
410 |
+ "LESSOPEN", |
411 |
+ "LOGNAME", |
412 |
+ "LS_COLORS", |
413 |
+ "PAGER", |
414 |
+ "TERM", |
415 |
+ "TERMCAP", |
416 |
+ "USER", |
417 |
+ "ftp_proxy", |
418 |
+ "http_proxy", |
419 |
+ "no_proxy", |
420 |
+ # tempdir settings |
421 |
+ "TMPDIR", |
422 |
+ "TEMP", |
423 |
+ "TMP", |
424 |
+ # localization settings |
425 |
+ "LANG", |
426 |
+ "LC_COLLATE", |
427 |
+ "LC_CTYPE", |
428 |
+ "LC_MESSAGES", |
429 |
+ "LC_MONETARY", |
430 |
+ "LC_NUMERIC", |
431 |
+ "LC_TIME", |
432 |
+ "LC_PAPER", |
433 |
+ "LC_ALL", |
434 |
+ # other variables inherited from the calling environment |
435 |
+ "CVS_RSH", |
436 |
+ "ECHANGELOG_USER", |
437 |
+ "GPG_AGENT_INFO", |
438 |
+ "SSH_AGENT_PID", |
439 |
+ "SSH_AUTH_SOCK", |
440 |
+ "STY", |
441 |
+ "WINDOW", |
442 |
+ "XAUTHORITY", |
443 |
+ ) |
444 |
+) |
445 |
|
446 |
environ_whitelist_re = re.compile(r"^(CCACHE_|DISTCC_).*") |
447 |
|
448 |
# Filter selected variables in the config.environ() method so that |
449 |
# they don't needlessly propagate down into the ebuild environment. |
450 |
-environ_filter = [] |
451 |
- |
452 |
# Exclude anything that could be extremely long here (like SRC_URI) |
453 |
# since that could cause execve() calls to fail with E2BIG errors. For |
454 |
# example, see bug #262647. |
455 |
-environ_filter += [ |
456 |
- "DEPEND", |
457 |
- "RDEPEND", |
458 |
- "PDEPEND", |
459 |
- "SRC_URI", |
460 |
- "BDEPEND", |
461 |
- "IDEPEND", |
462 |
-] |
463 |
- |
464 |
-# misc variables inherited from the calling environment |
465 |
-environ_filter += [ |
466 |
- "INFOPATH", |
467 |
- "MANPATH", |
468 |
- "USER", |
469 |
-] |
470 |
- |
471 |
-# variables that break bash |
472 |
-environ_filter += [ |
473 |
- "HISTFILE", |
474 |
- "POSIXLY_CORRECT", |
475 |
-] |
476 |
- |
477 |
-# portage config variables and variables set directly by portage |
478 |
-environ_filter += [ |
479 |
- "ACCEPT_CHOSTS", |
480 |
- "ACCEPT_KEYWORDS", |
481 |
- "ACCEPT_PROPERTIES", |
482 |
- "ACCEPT_RESTRICT", |
483 |
- "AUTOCLEAN", |
484 |
- "BINPKG_COMPRESS", |
485 |
- "BINPKG_COMPRESS_FLAGS", |
486 |
- "CLEAN_DELAY", |
487 |
- "COLLISION_IGNORE", |
488 |
- "CONFIG_PROTECT", |
489 |
- "CONFIG_PROTECT_MASK", |
490 |
- "EGENCACHE_DEFAULT_OPTS", |
491 |
- "EMERGE_DEFAULT_OPTS", |
492 |
- "EMERGE_LOG_DIR", |
493 |
- "EMERGE_WARNING_DELAY", |
494 |
- "FETCHCOMMAND", |
495 |
- "FETCHCOMMAND_FTP", |
496 |
- "FETCHCOMMAND_HTTP", |
497 |
- "FETCHCOMMAND_HTTPS", |
498 |
- "FETCHCOMMAND_RSYNC", |
499 |
- "FETCHCOMMAND_SFTP", |
500 |
- "GENTOO_MIRRORS", |
501 |
- "NOCONFMEM", |
502 |
- "O", |
503 |
- "PORTAGE_BACKGROUND", |
504 |
- "PORTAGE_BACKGROUND_UNMERGE", |
505 |
- "PORTAGE_BINHOST", |
506 |
- "PORTAGE_BINPKG_FORMAT", |
507 |
- "PORTAGE_BUILDDIR_LOCKED", |
508 |
- "PORTAGE_CHECKSUM_FILTER", |
509 |
- "PORTAGE_ELOG_CLASSES", |
510 |
- "PORTAGE_ELOG_MAILFROM", |
511 |
- "PORTAGE_ELOG_MAILSUBJECT", |
512 |
- "PORTAGE_ELOG_MAILURI", |
513 |
- "PORTAGE_ELOG_SYSTEM", |
514 |
- "PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS", |
515 |
- "PORTAGE_FETCH_RESUME_MIN_SIZE", |
516 |
- "PORTAGE_GPG_DIR", |
517 |
- "PORTAGE_GPG_KEY", |
518 |
- "PORTAGE_GPG_SIGNING_COMMAND", |
519 |
- "PORTAGE_IONICE_COMMAND", |
520 |
- "PORTAGE_PACKAGE_EMPTY_ABORT", |
521 |
- "PORTAGE_REPO_DUPLICATE_WARN", |
522 |
- "PORTAGE_RO_DISTDIRS", |
523 |
- "PORTAGE_RSYNC_EXTRA_OPTS", |
524 |
- "PORTAGE_RSYNC_OPTS", |
525 |
- "PORTAGE_RSYNC_RETRIES", |
526 |
- "PORTAGE_SSH_OPTS", |
527 |
- "PORTAGE_SYNC_STALE", |
528 |
- "PORTAGE_USE", |
529 |
- "PORTAGE_LOG_FILTER_FILE_CMD", |
530 |
- "PORTAGE_LOGDIR", |
531 |
- "PORTAGE_LOGDIR_CLEAN", |
532 |
- "QUICKPKG_DEFAULT_OPTS", |
533 |
- "REPOMAN_DEFAULT_OPTS", |
534 |
- "RESUMECOMMAND", |
535 |
- "RESUMECOMMAND_FTP", |
536 |
- "RESUMECOMMAND_HTTP", |
537 |
- "RESUMECOMMAND_HTTPS", |
538 |
- "RESUMECOMMAND_RSYNC", |
539 |
- "RESUMECOMMAND_SFTP", |
540 |
- "UNINSTALL_IGNORE", |
541 |
- "USE_EXPAND_HIDDEN", |
542 |
- "USE_ORDER", |
543 |
- "__PORTAGE_HELPER", |
544 |
-] |
545 |
- |
546 |
-# No longer supported variables |
547 |
-environ_filter += ["SYNC"] |
548 |
- |
549 |
-environ_filter = frozenset(environ_filter) |
550 |
+environ_filter = frozenset( |
551 |
+ ( |
552 |
+ "DEPEND", |
553 |
+ "RDEPEND", |
554 |
+ "PDEPEND", |
555 |
+ "SRC_URI", |
556 |
+ "BDEPEND", |
557 |
+ "IDEPEND", |
558 |
+ # misc variables inherited from the calling environment |
559 |
+ "INFOPATH", |
560 |
+ "MANPATH", |
561 |
+ "USER", |
562 |
+ # variables that break bash |
563 |
+ "HISTFILE", |
564 |
+ "POSIXLY_CORRECT", |
565 |
+ # portage config variables and variables set directly by portage |
566 |
+ "ACCEPT_CHOSTS", |
567 |
+ "ACCEPT_KEYWORDS", |
568 |
+ "ACCEPT_PROPERTIES", |
569 |
+ "ACCEPT_RESTRICT", |
570 |
+ "AUTOCLEAN", |
571 |
+ "BINPKG_COMPRESS", |
572 |
+ "BINPKG_COMPRESS_FLAGS", |
573 |
+ "CLEAN_DELAY", |
574 |
+ "COLLISION_IGNORE", |
575 |
+ "CONFIG_PROTECT", |
576 |
+ "CONFIG_PROTECT_MASK", |
577 |
+ "EGENCACHE_DEFAULT_OPTS", |
578 |
+ "EMERGE_DEFAULT_OPTS", |
579 |
+ "EMERGE_LOG_DIR", |
580 |
+ "EMERGE_WARNING_DELAY", |
581 |
+ "FETCHCOMMAND", |
582 |
+ "FETCHCOMMAND_FTP", |
583 |
+ "FETCHCOMMAND_HTTP", |
584 |
+ "FETCHCOMMAND_HTTPS", |
585 |
+ "FETCHCOMMAND_RSYNC", |
586 |
+ "FETCHCOMMAND_SFTP", |
587 |
+ "GENTOO_MIRRORS", |
588 |
+ "NOCONFMEM", |
589 |
+ "O", |
590 |
+ "PORTAGE_BACKGROUND", |
591 |
+ "PORTAGE_BACKGROUND_UNMERGE", |
592 |
+ "PORTAGE_BINHOST", |
593 |
+ "PORTAGE_BINPKG_FORMAT", |
594 |
+ "PORTAGE_BUILDDIR_LOCKED", |
595 |
+ "PORTAGE_CHECKSUM_FILTER", |
596 |
+ "PORTAGE_ELOG_CLASSES", |
597 |
+ "PORTAGE_ELOG_MAILFROM", |
598 |
+ "PORTAGE_ELOG_MAILSUBJECT", |
599 |
+ "PORTAGE_ELOG_MAILURI", |
600 |
+ "PORTAGE_ELOG_SYSTEM", |
601 |
+ "PORTAGE_FETCH_CHECKSUM_TRY_MIRRORS", |
602 |
+ "PORTAGE_FETCH_RESUME_MIN_SIZE", |
603 |
+ "PORTAGE_GPG_DIR", |
604 |
+ "PORTAGE_GPG_KEY", |
605 |
+ "PORTAGE_GPG_SIGNING_COMMAND", |
606 |
+ "PORTAGE_IONICE_COMMAND", |
607 |
+ "PORTAGE_PACKAGE_EMPTY_ABORT", |
608 |
+ "PORTAGE_REPO_DUPLICATE_WARN", |
609 |
+ "PORTAGE_RO_DISTDIRS", |
610 |
+ "PORTAGE_RSYNC_EXTRA_OPTS", |
611 |
+ "PORTAGE_RSYNC_OPTS", |
612 |
+ "PORTAGE_RSYNC_RETRIES", |
613 |
+ "PORTAGE_SSH_OPTS", |
614 |
+ "PORTAGE_SYNC_STALE", |
615 |
+ "PORTAGE_USE", |
616 |
+ "PORTAGE_LOG_FILTER_FILE_CMD", |
617 |
+ "PORTAGE_LOGDIR", |
618 |
+ "PORTAGE_LOGDIR_CLEAN", |
619 |
+ "QUICKPKG_DEFAULT_OPTS", |
620 |
+ "REPOMAN_DEFAULT_OPTS", |
621 |
+ "RESUMECOMMAND", |
622 |
+ "RESUMECOMMAND_FTP", |
623 |
+ "RESUMECOMMAND_HTTP", |
624 |
+ "RESUMECOMMAND_HTTPS", |
625 |
+ "RESUMECOMMAND_RSYNC", |
626 |
+ "RESUMECOMMAND_SFTP", |
627 |
+ "UNINSTALL_IGNORE", |
628 |
+ "USE_EXPAND_HIDDEN", |
629 |
+ "USE_ORDER", |
630 |
+ "__PORTAGE_HELPER", |
631 |
+ # No longer supported variables |
632 |
+ "SYNC", |
633 |
+ ) |
634 |
+) |
635 |
|
636 |
# Variables that are not allowed to have per-repo or per-package |
637 |
# settings. |