diff options
| author | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-14 03:11:41 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-14 03:11:41 +0200 |
| commit | 2d8eaedb61bdbe4a47d6b27c8a3e67754078773d (patch) | |
| tree | 05161eb93fb86268124a4306e067359c58223cac /bin/ebuild.sh | |
| parent | 216aeb7ab4854b278c809f07528534aefd44174d (diff) | |
| download | portage-2d8eaedb61bdbe4a47d6b27c8a3e67754078773d.tar.gz portage-2d8eaedb61bdbe4a47d6b27c8a3e67754078773d.tar.bz2 portage-2d8eaedb61bdbe4a47d6b27c8a3e67754078773d.zip | |
Use /usr/bin/python when PORTAGE_PYTHON variable is empty.
It avoids some errors during upgrade from older Portage versions.
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 6a2eeb1e6..e9f4b96cb 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -165,7 +165,7 @@ has_version() { fi PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1" + "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1" local retval=$? case "${retval}" in 0) @@ -186,7 +186,7 @@ portageq() { fi PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" "$@" + "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@" } @@ -208,7 +208,7 @@ best_version() { fi PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1" + "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1" local retval=$? case "${retval}" in 0) @@ -1728,7 +1728,7 @@ filter_readonly_variables() { " fi - "$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" + "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" } # @FUNCTION: preprocess_ebuild_env |