From 7358a4809c3853e203c3c4aa89650942c12b234e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 11 Oct 2009 20:36:59 +0000 Subject: Add some more EPYTHON safety. svn path=/main/trunk/; revision=14570 --- bin/misc-functions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bin/misc-functions.sh') diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 174f28c04..671a06935 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -441,7 +441,7 @@ install_qa_check() { done [[ $reset_debug = 1 ]] && set -x f=$(cat "${PORTAGE_LOG_FILE}" | \ - "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py) + EPYTHON= "$PORTAGE_BIN_PATH"/check-implicit-pointer-usage.py) if [[ -n ${f} ]] ; then # In the future this will be a forced "die". In preparation, @@ -710,7 +710,7 @@ 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'" - PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ + EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ python -c "from portage import xpak; t=xpak.tbz2('${PORTAGE_BINPKG_TMPFILE}'); t.recompose('${PORTAGE_BUILDDIR}/build-info')" if [ $? -ne 0 ]; then rm -f "${PORTAGE_BINPKG_TMPFILE}" -- cgit v1.2.3-1-g7c22