From: Brian Dolbec <dolsen@gentoo.org>
To: gentoo-portage-dev@lists.gentoo.org
Subject: Re: [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009)
Date: Tue, 28 Apr 2015 13:52:52 -0700 [thread overview]
Message-ID: <20150428135252.0eab75e6.dolsen@gentoo.org> (raw)
In-Reply-To: <1430082849-25101-1-git-send-email-zmedico@gentoo.org>
On Sun, 26 Apr 2015 14:14:09 -0700
Zac Medico <zmedico@gentoo.org> 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 <dolsen>
next prev parent reply other threads:[~2015-04-28 20:52 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-26 21:14 [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009) Zac Medico
2015-04-28 20:52 ` Brian Dolbec [this message]
2015-06-23 11:40 ` [gentoo-portage-dev] " Michael Haubenwallner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150428135252.0eab75e6.dolsen@gentoo.org \
--to=dolsen@gentoo.org \
--cc=gentoo-portage-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox