summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-11-29 07:56:34 +0000
committerZac Medico <zmedico@gentoo.org>2007-11-29 07:56:34 +0000
commitde1aeb34f8dd6772fba1cbb7136996c66235dbf9 (patch)
treee8cf52ab9ec9f66923a22bfbcf356fce37edebd1
parent2d8d34c09770f315582e09935d14c5b42cfaa8a9 (diff)
downloadportage-de1aeb34f8dd6772fba1cbb7136996c66235dbf9.tar.gz
portage-de1aeb34f8dd6772fba1cbb7136996c66235dbf9.tar.bz2
portage-de1aeb34f8dd6772fba1cbb7136996c66235dbf9.zip
Adjust PYTHONPATH when calling portageq so that variable
PORTAGE_PYM_PATH works. (trunk r8745) svn path=/main/branches/2.1.2/; revision=8746
-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"
}