diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-09-02 15:56:46 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-09-02 15:56:46 -0700 |
| commit | d184c0f32eba2eec3a8d28ae71be79aa635db147 (patch) | |
| tree | e351595adec837826161570d8a4723d3eaa52af9 | |
| parent | 952d5c235ed1b440cd156654014fd51f55b638cb (diff) | |
| download | portage-d184c0f32eba2eec3a8d28ae71be79aa635db147.tar.gz portage-d184c0f32eba2eec3a8d28ae71be79aa635db147.tar.bz2 portage-d184c0f32eba2eec3a8d28ae71be79aa635db147.zip | |
Quote ${EAPI} more.
This will avoid a potential syntax error in save-ebuild-env.sh if a
saved environment containing corrupt EAPI is sourced.
| -rwxr-xr-x | bin/ebuild-helpers/doheader | 2 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/newins | 2 | ||||
| -rw-r--r-- | bin/phase-functions.sh | 6 | ||||
| -rw-r--r-- | bin/phase-helpers.sh | 2 | ||||
| -rw-r--r-- | bin/save-ebuild-env.sh | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/bin/ebuild-helpers/doheader b/bin/ebuild-helpers/doheader index 9bbe5bc29..c51ec1ed9 100755 --- a/bin/ebuild-helpers/doheader +++ b/bin/ebuild-helpers/doheader @@ -4,7 +4,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh -case ${EAPI} in +case "${EAPI}" in 0|1|2|3|4|4-python|4-slot-abi) die "${0##*/} is not supported in EAPI ${EAPI}" ;; diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins index 2dc041d15..54245f3bc 100755 --- a/bin/ebuild-helpers/newins +++ b/bin/ebuild-helpers/newins @@ -15,7 +15,7 @@ fi eqawarn "QA Notice: ${helper} called with more than 2 arguments: ${@:3}" stdin= -case ${EAPI} in +case "${EAPI}" in 0|1|2|3|4|4-python|4-slot-abi) ;; *) [[ $1 = "-" ]] && stdin=yes ;; esac diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index fd7fb25b9..68a33a871 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -755,12 +755,12 @@ _ebuild_phase_funcs() { eval "$x() { _eapi0_$x \"\$@\" ; }" done - case $eapi in + case "$eapi" in 0|1) if ! declare -F src_compile >/dev/null ; then - case $eapi in + case "$eapi" in 0) src_compile() { _eapi0_src_compile "$@" ; } ;; @@ -807,7 +807,7 @@ _ebuild_phase_funcs() { eval "default() { _eapi2_$phase_func \"\$@\" ; }" - case $eapi in + case "$eapi" in 2|3) ;; *) diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh index 46f713211..0587991f9 100644 --- a/bin/phase-helpers.sh +++ b/bin/phase-helpers.sh @@ -174,7 +174,7 @@ usev() { return 1 } -case ${EAPI} in +case "${EAPI}" in 0|1|2|3|4|4-python|4-slot-abi) ;; *) usex() { diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index 75e48437a..6d6ed41b6 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -73,7 +73,7 @@ save_ebuild_env() { _hasg _hasgq _unpack_tar \ ${QA_INTERCEPTORS} - case ${EAPI} in + case "${EAPI}" in 0|1|2|3|4|4-python|4-slot-abi) ;; *) unset -f usex ;; esac |