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/misc-functions.sh | |
| parent | Set PORTAGE_PYTHON in processes executed by portage.process._exec(). (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/misc-functions.sh')
| -rwxr-xr-x | bin/misc-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 8207006ed..0108b001f 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -489,7 +489,7 @@ install_qa_check() { done [[ $reset_debug = 1 ]] && set -x f=$(cat "${PORTAGE_LOG_FILE}" | \ - "$PORTAGE_PYTHON" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed") + "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed") if [[ -n ${f} ]] ; then # In the future this will be a forced "die". In preparation, @@ -779,7 +779,7 @@ dyn_package() { bzip2 -cf > "$PORTAGE_BINPKG_TMPFILE" assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'" PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "$PORTAGE_PYTHON" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ + "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ "$PORTAGE_BINPKG_TMPFILE" "$PORTAGE_BUILDDIR/build-info" if [ $? -ne 0 ]; then rm -f "${PORTAGE_BINPKG_TMPFILE}" |