diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-10-11 20:41:01 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-10-11 20:41:01 +0000 |
commit | 6becc6f1066379f5c1b026f1f6d86f911c4a1247 (patch) | |
tree | 0c84a4b64809a321a21aa1f0afd7a24eb579ef48 | |
parent | 1a53b8d9a160ba92185d94ae56487fc888887b7c (diff) | |
download | portage-6becc6f1066379f5c1b026f1f6d86f911c4a1247.tar.gz portage-6becc6f1066379f5c1b026f1f6d86f911c4a1247.tar.bz2 portage-6becc6f1066379f5c1b026f1f6d86f911c4a1247.zip |
Set EPYTHON variable as empty when calling portageq or dohtml to avoid using potentially unsupported version of Python.
(trunk r14568)
svn path=/main/branches/2.1.7/; revision=14571
-rwxr-xr-x | bin/ebuild.sh | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 0a598a68b..84b35355d 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -160,13 +160,16 @@ useq() { fi } +# Return true if given package is installed. Otherwise return false. +# Takes single depend-type atoms. has_version() { if [ "${EBUILD_PHASE}" == "depend" ]; then die "portageq calls (has_version calls portageq) are not allowed in the global scope" fi - # return shell-true/shell-false if exists. - # Takes single depend-type atoms. - PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + + # Set EPYTHON variable as empty so that portageq doesn't try + # to use potentially unsupported version of Python. + EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1" local retval=$? case "${retval}" in @@ -186,7 +189,10 @@ portageq() { if [ "${EBUILD_PHASE}" == "depend" ]; then die "portageq calls are not allowed in the global scope" fi - PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + + # Set EPYTHON variable as empty so that portageq doesn't try + # to use potentially unsupported version of Python. + EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}/portageq" "$@" } @@ -196,13 +202,16 @@ portageq() { # ---------------------------------------------------------------------------- +# Returns the best/most-current match. +# Takes single depend-type atoms. best_version() { if [ "${EBUILD_PHASE}" == "depend" ]; then die "portageq calls (best_version calls portageq) are not allowed in the global scope" fi - # returns the best/most-current match. - # Takes single depend-type atoms. - PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + + # Set EPYTHON variable as empty so that portageq doesn't try + # to use potentially unsupported version of Python. + EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1" local retval=$? case "${retval}" in @@ -218,6 +227,13 @@ best_version() { esac } +dohtml() { + # Set EPYTHON variable as empty so that dohtml doesn't try + # to use potentially unsupported version of Python. + EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + "${PORTAGE_BIN_PATH}/ebuild-helpers/dohtml" "$@" +} + use_with() { if [ -z "$1" ]; then echo "!!! use_with() called without a parameter." >&2 |