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 6B7D9138C9D for ; Sun, 26 Apr 2015 21:14:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF802E089C; Sun, 26 Apr 2015 21:14:33 +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 5B3F7E0886 for ; Sun, 26 Apr 2015 21:14:33 +0000 (UTC) Received: from localhost.localdomain (ip174-67-205-96.oc.oc.cox.net [174.67.205.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: zmedico) by smtp.gentoo.org (Postfix) with ESMTPSA id F0536340EE1; Sun, 26 Apr 2015 21:14:31 +0000 (UTC) From: Zac Medico To: gentoo-portage-dev@lists.gentoo.org Cc: Zac Medico Subject: [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009) Date: Sun, 26 Apr 2015 14:14:09 -0700 Message-Id: <1430082849-25101-1-git-send-email-zmedico@gentoo.org> X-Mailer: git-send-email 2.3.5 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 X-Archives-Salt: 11e8594d-77b6-46e5-8661-2a179585e351 X-Archives-Hash: 433c81924690a77984c21b603e0f6b6c 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}" @@ -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 -- 2.3.5