From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RdZvr-0004Gg-Nv for garchives@archives.gentoo.org; Thu, 22 Dec 2011 04:07:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8209F21C046; Thu, 22 Dec 2011 04:06:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5252A21C046 for ; Thu, 22 Dec 2011 04:06:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A36761B4011 for ; Thu, 22 Dec 2011 04:06:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CCEB680042 for ; Thu, 22 Dec 2011 04:06:52 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <7ae2254d1e8db0e3976b82c65a8640cfc99cedb1.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: 7ae2254d1e8db0e3976b82c65a8640cfc99cedb1 Date: Thu, 22 Dec 2011 04:06:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 5e333732-1847-4591-b003-4ed9c751f63c X-Archives-Hash: f067968a02fefef50c3a0148dfedf199 commit: 7ae2254d1e8db0e3976b82c65a8640cfc99cedb1 Author: Zac Medico gentoo org> AuthorDate: Thu Dec 22 04:06:36 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Dec 22 04:06:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7ae2254d filter_readonly_variables: preserve binpkg vars --- bin/phase-functions.sh | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 26ffde6..482fd6a 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -74,6 +74,8 @@ PORTAGE_MUTABLE_FILTERED_VARS=3D"AA HOSTNAME" # # ---allow-extra-vars causes some extra vars to be allowd through, such # as ${PORTAGE_SAVED_READONLY_VARS} and ${PORTAGE_MUTABLE_FILTERED_VARS}= . +# This is enabled automatically if EMERGE_FROM=3Dbinary, since it preser= ves +# variables from when the package was originally built. # # In bash-3.2_p20+ an attempt to assign BASH_*, FUNCNAME, GROUPS or any # readonly variable cause the shell to exit while executing the "source" @@ -122,7 +124,7 @@ filter_readonly_variables() { LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_PAPER LC_TIME" fi - if ! has --allow-extra-vars $* ; then + if [[ ${EMERGE_FROM} !=3D binary ]] && ! has --allow-extra-vars $* ; th= en filtered_vars=3D" ${filtered_vars} ${PORTAGE_SAVED_READONLY_VARS}