From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1111147-garchives=archives.gentoo.org@lists.gentoo.org>
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 4D611138334
for <garchives@archives.gentoo.org>; Sun, 15 Sep 2019 03:08:23 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7D08DE0877;
Sun, 15 Sep 2019 03:08:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.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 64294E0877
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Sep 2019 03:08:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 31DBD34B1A6
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Sep 2019 03:08:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D1B17CD
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Sep 2019 03:08:18 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
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" <zmedico@gentoo.org>
Message-ID: <1568516831.6619580ca329fef1df86670457e87fdfddba6589.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-functions.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: 6619580ca329fef1df86670457e87fdfddba6589
X-VCS-Branch: master
Date: Sun, 15 Sep 2019 03:08:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fecba94b-13eb-47c7-9f83-2e95a37226d0
X-Archives-Hash: 9391b947511169db02cda91250683952
commit: 6619580ca329fef1df86670457e87fdfddba6589
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Sep 15 02:57:53 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 03:07:11 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6619580c
__ebuild_main: Rename phase_func variable to ___phase_func.
___* variables are now automatically filtered by __filter_readonly_variables().
`unset` does not actually remove local variables, it only removes their values.
Previously phase_func variable was stored (without value) in environment.bz2 files in VDB.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
bin/phase-functions.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 0bc0d525e..92fcd3929 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -981,9 +981,8 @@ __ebuild_main() {
# respect FEATURES="-ccache".
has ccache $FEATURES || export CCACHE_DISABLE=1
- local phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE")
- [[ -n $phase_func ]] && __ebuild_phase_funcs "$EAPI" "$phase_func"
- unset phase_func
+ local ___phase_func=$(__ebuild_arg_to_phase "$EBUILD_PHASE")
+ [[ -n ${___phase_func} ]] && __ebuild_phase_funcs "$EAPI" "${___phase_func}"
__source_all_bashrcs