Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH] special_env_vars: add ENV_UNSET to environ_whitelist (bug 700830)
Date: Sun, 12 Apr 2020 23:21:12
Message-Id: 20200412231807.51929-1-zmedico@gentoo.org
1 Add ENV_UNSET to the environ_whitelist. Since DISPLAY is also in
2 the environ_whitelist, ENV_UNSET must also be in environ_whitelist
3 in order to unset DISPLAY.
4
5 Fixes: a5e02c92fd72 ("Support ENV_UNSET for EAPI 7")
6 Bug: https://bugs.gentoo.org/700830
7 ---
8 lib/portage/package/ebuild/_config/special_env_vars.py | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11 diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py
12 index dc01339f7..440dd00b2 100644
13 --- a/lib/portage/package/ebuild/_config/special_env_vars.py
14 +++ b/lib/portage/package/ebuild/_config/special_env_vars.py
15 @@ -47,7 +47,7 @@ environ_whitelist += [
16 "DISTDIR", "DOC_SYMLINKS_DIR", "EAPI", "EBUILD",
17 "EBUILD_FORCE_TEST",
18 "EBUILD_PHASE", "EBUILD_PHASE_FUNC", "ECLASSDIR", "ECLASS_DEPTH", "ED",
19 - "EMERGE_FROM", "EPREFIX", "EROOT", "ESYSROOT",
20 + "EMERGE_FROM", "ENV_UNSET", "EPREFIX", "EROOT", "ESYSROOT",
21 "FEATURES", "FILESDIR", "HOME", "MERGE_TYPE", "NOCOLOR", "PATH",
22 "PKGDIR",
23 "PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",
24 --
25 2.24.1