summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-29 07:55:34 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-29 07:55:34 +0000
commit8c6ddc77bbacf7dd72efc7b609a3346c16d0cbdf (patch)
tree81acaa98b69f7749fd8d559a95779d9579621563
parent332af2d11866a7a1e4d2d22a84c6dbfffd794de6 (diff)
downloadportage-8c6ddc77bbacf7dd72efc7b609a3346c16d0cbdf.tar.gz
portage-8c6ddc77bbacf7dd72efc7b609a3346c16d0cbdf.tar.bz2
portage-8c6ddc77bbacf7dd72efc7b609a3346c16d0cbdf.zip
Adjust PYTHONPATH when calling portageq so that variable
PORTAGE_PYM_PATH works. svn path=/main/trunk/; revision=8745
-rwxr-xr-xbin/ebuild.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6bf5d88b7..a5b89c9d4 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -149,6 +149,7 @@ has_version() {
fi
# return shell-true/shell-false if exists.
# Takes single depend-type atoms.
+ PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
"${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1"
local retval=$?
case "${retval}" in
@@ -168,6 +169,7 @@ portageq() {
if [ "${EBUILD_PHASE}" == "depend" ]; then
die "portageq calls are not allowed in the global scope"
fi
+ PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
"${PORTAGE_BIN_PATH}/portageq" "$@"
}
@@ -183,6 +185,7 @@ best_version() {
fi
# returns the best/most-current match.
# Takes single depend-type atoms.
+ PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
"${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
}