From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DD269138239 for ; Sun, 12 Apr 2020 23:46:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17113E086A; Sun, 12 Apr 2020 23:46:11 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0081EE086A for ; Sun, 12 Apr 2020 23:46:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC19734F198 for ; Sun, 12 Apr 2020 23:46:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5567103 for ; Sun, 12 Apr 2020 23:46:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1586735131.5570a96ddc859851036035baa4da65df2daa51a0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/_config/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/_config/special_env_vars.py X-VCS-Directories: lib/portage/package/ebuild/_config/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 5570a96ddc859851036035baa4da65df2daa51a0 X-VCS-Branch: master Date: Sun, 12 Apr 2020 23:46:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3cc05caf-53eb-462e-b217-0a33a5ff731b X-Archives-Hash: d4f573d6ec87427f2bd82cbab2204b22 commit: 5570a96ddc859851036035baa4da65df2daa51a0 Author: Zac Medico gentoo org> AuthorDate: Sun Apr 12 23:11:06 2020 +0000 Commit: Zac Medico gentoo 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 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",