diff options
| -rwxr-xr-x | bin/ebuild.sh | 6 | ||||
| -rwxr-xr-x | bin/misc-functions.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 401303024..13e0e2243 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -166,7 +166,7 @@ has_version() { fi # return shell-true/shell-false if exists. # Takes single depend-type atoms. - PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ + PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1" local retval=$? case "${retval}" in @@ -186,7 +186,7 @@ portageq() { if [ "${EBUILD_PHASE}" == "depend" ]; then die "portageq calls are not allowed in the global scope" fi - PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ + PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}/portageq" "$@" } @@ -202,7 +202,7 @@ best_version() { fi # returns the best/most-current match. # Takes single depend-type atoms. - PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \ + PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \ "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1" local retval=$? case "${retval}" in diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index cc90034a3..ebd1d8fe6 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -639,7 +639,7 @@ dyn_package() { tar $tar_options -cf - $PORTAGE_BINPKG_TAR_OPTS -C "${D}" . | \ bzip2 -f > "$PORTAGE_BINPKG_TMPFILE" || \ die "Failed to create tarball" - export PYTHONPATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}:${PYTHONPATH}" + 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}" |