summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild.sh2
-rwxr-xr-xbin/misc-functions.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 1602601aa..a9e09b202 100755
--- 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 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}"