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 <gentoo-commits+bounces-411587-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1RdoUq-0000Uh-6A
for garchives@archives.gentoo.org; Thu, 22 Dec 2011 19:40:10 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5A4C921C27B;
Thu, 22 Dec 2011 19:39:51 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 2DE4121C27B
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 19:39:51 +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 AC0031B403A
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 19:39:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 1443180042
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 19:39:50 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <8d524638e4e664a684d781181a09eee3de12319c.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: 8d524638e4e664a684d781181a09eee3de12319c
Date: Thu, 22 Dec 2011 19:39:50 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 2eac97fb-8eb1-4943-b613-e687bfa8a08f
X-Archives-Hash: 9665bf9c9b7ed19205a0b3c7683650b6
commit: 8d524638e4e664a684d781181a09eee3de12319c
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 19:39:32 2011 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 19:39:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3D8d524638
filter_readonly_variables: refactor binpkg logic
---
bin/phase-functions.sh | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh
index 7407aba..2167853 100644
--- a/bin/phase-functions.sh
+++ b/bin/phase-functions.sh
@@ -126,14 +126,15 @@ filter_readonly_variables() {
LC_CTYPE LC_MESSAGES LC_MONETARY
LC_NUMERIC LC_PAPER LC_TIME"
fi
- if [[ ${EMERGE_FROM} !=3D binary ]] && ! has --allow-extra-vars $* ; th=
en
- filtered_vars=3D"
- ${filtered_vars}
- ${PORTAGE_SAVED_READONLY_VARS}
- ${PORTAGE_MUTABLE_FILTERED_VARS}
- "
- elif ! has --allow-extra-vars $* ; then
- filtered_vars+=3D" ${binpkg_untrusted_vars}"
+ if ! has --allow-extra-vars $* ; then
+ if [ "${EMERGE_FROM}" =3D binary ] ; then
+ # preserve additional variables from build time,
+ # while excluding untrusted variables
+ filtered_vars+=3D" ${binpkg_untrusted_vars}"
+ else
+ filtered_vars+=3D" ${PORTAGE_SAVED_READONLY_VARS}"
+ filtered_vars+=3D" ${PORTAGE_MUTABLE_FILTERED_VARS}"
+ fi
fi
=20
"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-=
environment.py "${filtered_vars}" || die "filter-bash-environment.py fail=
ed"