diff options
| -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 deadbf3eb..1602601aa 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 |