* [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009)
@ 2015-04-26 21:14 99% Zac Medico
0 siblings, 0 replies; 1+ results
From: Zac Medico @ 2015-04-26 21:14 UTC (permalink / raw
To: gentoo-portage-dev; +Cc: Zac Medico
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
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2015-04-26 21:14 99% [gentoo-portage-dev] [PATCH] Make the USE variable readonly (bug 325009) Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox