From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A10D4138C9D for ; Tue, 28 Apr 2015 20:52:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D054BE093A; Tue, 28 Apr 2015 20:52:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52E57E0933 for ; Tue, 28 Apr 2015 20:52:56 +0000 (UTC) Received: from big_daddy.dol-sen.ca (S010634bdfa9ecf80.vc.shawcable.net [96.49.31.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 7352F340C6B for ; Tue, 28 Apr 2015 20:52:55 +0000 (UTC) Date: Tue, 28 Apr 2015 13:52:52 -0700 From: Brian Dolbec To: gentoo-portage-dev@lists.gentoo.org Subject: Re: [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009) Message-ID: <20150428135252.0eab75e6.dolsen@gentoo.org> In-Reply-To: <1430082849-25101-1-git-send-email-zmedico@gentoo.org> References: <1430082849-25101-1-git-send-email-zmedico@gentoo.org> Organization: Gentoo Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-portage-dev@lists.gentoo.org Reply-to: gentoo-portage-dev@lists.gentoo.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Archives-Salt: 8b8b612f-e059-42dd-8d6b-e1466e2d23de X-Archives-Hash: cfc690b7d459870590c74969ace7c461 On Sun, 26 Apr 2015 14:14:09 -0700 Zac Medico wrote: > This requires the EBUILD_FORCE_TEST code from dyn_test to execute > before USE is declared readonly. > > X-Gentoo-Bug: 325009 > X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=325009 > --- > bin/ebuild.sh | 10 +++++++++- > bin/phase-functions.sh | 9 +-------- > 2 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/bin/ebuild.sh b/bin/ebuild.sh > index b6b3723..4e26f87 100755 > --- a/bin/ebuild.sh > +++ b/bin/ebuild.sh > @@ -1,5 +1,5 @@ > #!/bin/bash > -# Copyright 1999-2013 Gentoo Foundation > +# Copyright 1999-2015 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}" Anthony brought up about PORTAGE_PYM_PATH, I see above the same for PORTAGE_BIN_PATH, having the OLD install location hardcoded into the path. I know it is not relevent to this patch. But noting it here anyway. > @@ -746,6 +746,14 @@ else > declare -r ED EPREFIX EROOT > fi > > + # If ${EBUILD_FORCE_TEST} == 1 and USE came from > ${T}/environment > + # then it might not have USE=test like it's supposed to here. > + if [[ ${EBUILD_PHASE} == test && ${EBUILD_FORCE_TEST} == 1 && > + test =~ ${PORTAGE_IUSE} ]] && ! has test ${USE} ; > then > + export USE="${USE} test" > + fi > + declare -r USE > + > if [[ -n $EBUILD_SH_ARGS ]] ; then > ( > # Don't allow subprocesses to inherit the > pipe which diff --git a/bin/phase-functions.sh > b/bin/phase-functions.sh index 2743e27..7bf4d63 100644 > --- a/bin/phase-functions.sh > +++ b/bin/phase-functions.sh > @@ -1,5 +1,5 @@ > #!/bin/bash > -# Copyright 1999-2013 Gentoo Foundation > +# Copyright 1999-2015 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > > # Hardcoded bash lists are needed for backward compatibility with > @@ -489,13 +489,6 @@ __dyn_test() { > elif [[ ${EBUILD_FORCE_TEST} != 1 ]] && ! has test > ${FEATURES} ; then __vecho ">>> Test phase [not enabled]: > ${CATEGORY}/${PF}" else > - # If ${EBUILD_FORCE_TEST} == 1 and USE came from > ${T}/environment > - # then it might not have USE=test like it's supposed > to here. > - if [[ ${EBUILD_FORCE_TEST} == 1 && test =~ > ${PORTAGE_IUSE} ]] && \ > - ! has test ${USE} ; then > - export USE="${USE} test" > - fi > - > local save_sp=${SANDBOX_PREDICT} > addpredict / > __ebuild_phase pre_src_test Looks good -- Brian Dolbec