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-helpers | |
| 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-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/dohtml | 2 | ||||
| -rwxr-xr-x | bin/ebuild-helpers/portageq | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml index 6de730c6d..cb29dc3f3 100755 --- a/bin/ebuild-helpers/dohtml +++ b/bin/ebuild-helpers/dohtml @@ -7,7 +7,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - "$PORTAGE_PYTHON" "$PORTAGE_BIN_PATH/dohtml.py" "$@" + "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/dohtml.py" "$@" ret=$? [[ $ret -ne 0 ]] && helpers_die "$0 failed" diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq index 8dee54c32..ec30b66cb 100755 --- a/bin/ebuild-helpers/portageq +++ b/bin/ebuild-helpers/portageq @@ -5,4 +5,4 @@ PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} PYTHONPATH=$PORTAGE_PYM_PATH${PYTHONPATH:+:}$PYTHONPATH \ - exec "$PORTAGE_PYTHON" "$PORTAGE_BIN_PATH/portageq" "$@" + exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@" |