commit:     5570a96ddc859851036035baa4da65df2daa51a0
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 23:11:06 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 23:45:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=5570a96d

special_env_vars: add ENV_UNSET to environ_whitelist (bug 700830)

Add ENV_UNSET to the environ_whitelist. Since DISPLAY is also in
the environ_whitelist, ENV_UNSET must also be in environ_whitelist
in order to unset DISPLAY.

Fixes: a5e02c92fd72 ("Support ENV_UNSET for EAPI 7")
Bug: https://bugs.gentoo.org/700830
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/package/ebuild/_config/special_env_vars.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py 
b/lib/portage/package/ebuild/_config/special_env_vars.py
index dc01339f7..440dd00b2 100644
--- a/lib/portage/package/ebuild/_config/special_env_vars.py
+++ b/lib/portage/package/ebuild/_config/special_env_vars.py
@@ -47,7 +47,7 @@ environ_whitelist += [
        "DISTDIR", "DOC_SYMLINKS_DIR", "EAPI", "EBUILD",
        "EBUILD_FORCE_TEST",
        "EBUILD_PHASE", "EBUILD_PHASE_FUNC", "ECLASSDIR", "ECLASS_DEPTH", "ED",
-       "EMERGE_FROM", "EPREFIX", "EROOT", "ESYSROOT",
+       "EMERGE_FROM", "ENV_UNSET", "EPREFIX", "EROOT", "ESYSROOT",
        "FEATURES", "FILESDIR", "HOME", "MERGE_TYPE", "NOCOLOR", "PATH",
        "PKGDIR",
        "PKGUSE", "PKG_LOGDIR", "PKG_TMPDIR",

Reply via email to