summaryrefslogtreecommitdiffstats
path: root/bin/save-ebuild-env.sh
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-09-11 20:06:27 -0700
committerZac Medico <zmedico@gentoo.org>2011-09-11 20:06:27 -0700
commit9fd712873f8f974089bbd4ab43f3ff4bd3308aa9 (patch)
treeb2f0ea1e356e05d473841c014d25b69ccb5f7c37 /bin/save-ebuild-env.sh
parent324628c70352d3aad4c32c51ce254964e5b19554 (diff)
downloadportage-9fd712873f8f974089bbd4ab43f3ff4bd3308aa9.tar.gz
portage-9fd712873f8f974089bbd4ab43f3ff4bd3308aa9.tar.bz2
portage-9fd712873f8f974089bbd4ab43f3ff4bd3308aa9.zip
save-ebuild-env.sh: tweak PYTHONPATH cleansing
Diffstat (limited to 'bin/save-ebuild-env.sh')
-rw-r--r--bin/save-ebuild-env.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh
index 3bb8255ab..a84a1258b 100644
--- a/bin/save-ebuild-env.sh
+++ b/bin/save-ebuild-env.sh
@@ -14,9 +14,13 @@ save_ebuild_env() {
(
if has --exclude-init-phases $* ; then
unset S _E_DOCDESTTREE_ _E_EXEDESTTREE_
- if [[ -n $PYTHONPATH ]] ; then
- export PYTHONPATH=${PYTHONPATH/${PORTAGE_PYM_PATH}:}
- [[ -z $PYTHONPATH ]] && unset PYTHONPATH
+ if [[ -n $PYTHONPATH &&
+ ${PYTHONPATH%%:*} -ef $PORTAGE_PYM_PATH ]] ; then
+ if [[ $PYTHONPATH == *:* ]] ; then
+ export PYTHONPATH=${PYTHONPATH#*:}
+ else
+ unset PYTHONPATH
+ fi
fi
fi