diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-10-11 20:36:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-10-11 20:36:59 +0000 |
| commit | 7358a4809c3853e203c3c4aa89650942c12b234e (patch) | |
| tree | 281e57a63c8e4a840c5e96641fad8aa0a629c9bd /bin/misc-functions.sh | |
| parent | 5ff20108a04392e0eb7d7fd7df35a29cc24a0067 (diff) | |
| download | portage-7358a4809c3853e203c3c4aa89650942c12b234e.tar.gz portage-7358a4809c3853e203c3c4aa89650942c12b234e.tar.bz2 portage-7358a4809c3853e203c3c4aa89650942c12b234e.zip | |
Add some more EPYTHON safety.
svn path=/main/trunk/; revision=14570
Diffstat (limited to 'bin/misc-functions.sh')
| -rwxr-xr-x | bin/misc-functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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}" |