Add some more EPYTHON safety. (trunk r14570)

svn path=/main/branches/2.1.7/; revision=14572

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 84b35355def21c71b4de59d6e29fa1534f9e03da..d026fddf5f362789d6cdcf9bb3f24a9c593aa0c1 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1632,7 +1632,7 @@ filter_readonly_variables() {
                "
        fi
 
-       "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}"
+       EPYTHON= "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}"
 }
 
 # @FUNCTION: preprocess_ebuild_env

diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 174f28c047480fd01e565f65e722ff64cbacc126..671a0693502a66850549e2e54124ff8ed5751edd 100755 (executable)
--- 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}"