[gentoo-commits] portage r11511 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-09-13 23:21:43 +0000 (Sat, 13 Sep 2008)
New Revision: 11511

Modified:
   main/trunk/bin/ebuild.sh
Log:
Fix PYTHONPATH adjustments to only insert a colon when necessary. This
is necessary since having a stray colon causes python to interpret the
empty path entry as "." which triggers the following message if cwd
happens to contain a directory names "os":

 warning: Not importing directory 'os': missing __init__.py

Thanks to Joe Peterson <lavajoe@g.o> for reporting.


Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh	2008-09-13 18:10:15 UTC (rev 11510)
+++ main/trunk/bin/ebuild.sh	2008-09-13 23:21:43 UTC (rev 11511)
@@ -166,7 +166,7 @@
 	fi
 	# return shell-true/shell-false if exists.
 	# Takes single depend-type atoms.
-	PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
+	PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \
 	"${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in
@@ -186,7 +186,7 @@
 	if [ "${EBUILD_PHASE}" == "depend" ]; then
 		die "portageq calls are not allowed in the global scope"
 	fi
-	PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
+	PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \
 	"${PORTAGE_BIN_PATH}/portageq" "$@"
 }
 
@@ -202,7 +202,7 @@
 	fi
 	# returns the best/most-current match.
 	# Takes single depend-type atoms.
-	PYTHONPATH="${PORTAGE_PYM_PATH}:${PYTHONPATH}" \
+	PYTHONPATH="${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH}" \
 	"${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in