diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-14 00:28:36 +0200 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org> | 2010-08-14 00:28:36 +0200 |
| commit | 1aca7a6adf643afde027778f1acbde7226dcea72 (patch) | |
| tree | fddc8859a1be3657d6e4e71221c8a2e5ec12d628 /bin/misc-functions.sh | |
| parent | Setup EBUILD_MASTER_PID at the bottom, for scripts that source (diff) | |
| download | portage-1aca7a6adf643afde027778f1acbde7226dcea72.tar.gz portage-1aca7a6adf643afde027778f1acbde7226dcea72.tar.bz2 portage-1aca7a6adf643afde027778f1acbde7226dcea72.zip | |
Ensure that all Python processes use the same version of Python.
Diffstat (limited to 'bin/misc-functions.sh')
| -rwxr-xr-x | bin/misc-functions.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index c965495b6..8207006ed 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # # Miscellaneous shell functions that make use of the ebuild env but don't need @@ -489,7 +489,7 @@ install_qa_check() { done [[ $reset_debug = 1 ]] && set -x f=$(cat "${PORTAGE_LOG_FILE}" | \ - EPYTHON= "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py || die "check-implicit-pointer-usage.py failed") + "$PORTAGE_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, @@ -778,8 +778,8 @@ dyn_package() { tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ bzip2 -cf > "$PORTAGE_BINPKG_TMPFILE" assert "failed to pack binary package: '$PORTAGE_BINPKG_TMPFILE'" - EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ - "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ + PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + "$PORTAGE_PYTHON" "$PORTAGE_BIN_PATH"/xpak-helper.py recompose \ "$PORTAGE_BINPKG_TMPFILE" "$PORTAGE_BUILDDIR/build-info" if [ $? -ne 0 ]; then rm -f "${PORTAGE_BINPKG_TMPFILE}" |