From 1aca7a6adf643afde027778f1acbde7226dcea72 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Date: Sat, 14 Aug 2010 00:28:36 +0200
Subject: Ensure that all Python processes use the same version of Python.

---
 bin/ebuild.sh | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9af7e3867..6a2eeb1e6 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
@@ -164,10 +164,8 @@ has_version() {
 		return $?
 	fi
 
-	# Set EPYTHON variable as empty so that portageq doesn't try
-	# to use potentially unsupported version of Python.
-	EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1"
+	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in
 		0)
@@ -187,10 +185,8 @@ portageq() {
 		die "portageq calls are not allowed in the global scope"
 	fi
 
-	# Set EPYTHON variable as empty so that portageq doesn't try
-	# to use potentially unsupported version of Python.
-	EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PORTAGE_BIN_PATH}/portageq" "$@"
+	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" "$@"
 }
 
 
@@ -211,10 +207,8 @@ best_version() {
 		return $?
 	fi
 
-	# Set EPYTHON variable as empty so that portageq doesn't try
-	# to use potentially unsupported version of Python.
-	EPYTHON= PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
+	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
+	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in
 		0)
@@ -1734,7 +1728,7 @@ filter_readonly_variables() {
 		"
 	fi
 
-	EPYTHON= "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
+	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
 }
 
 # @FUNCTION: preprocess_ebuild_env
-- 
cgit v1.2.3-1-g7c22


From 2d8eaedb61bdbe4a47d6b27c8a3e67754078773d Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Gentoo.Org>
Date: Sat, 14 Aug 2010 03:11:41 +0200
Subject: Use /usr/bin/python when PORTAGE_PYTHON variable is empty. It avoids
 some errors during upgrade from older Portage versions.

---
 bin/ebuild.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'bin/ebuild.sh')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 6a2eeb1e6..e9f4b96cb 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -165,7 +165,7 @@ has_version() {
 	fi
 
 	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
+	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" has_version "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in
 		0)
@@ -186,7 +186,7 @@ portageq() {
 	fi
 
 	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" "$@"
+	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@"
 }
 
 
@@ -208,7 +208,7 @@ best_version() {
 	fi
 
 	PYTHONPATH=${PORTAGE_PYM_PATH}${PYTHONPATH:+:}${PYTHONPATH} \
-	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
+	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
 	local retval=$?
 	case "${retval}" in
 		0)
@@ -1728,7 +1728,7 @@ filter_readonly_variables() {
 		"
 	fi
 
-	"$PORTAGE_PYTHON" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
+	"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed"
 }
 
 # @FUNCTION: preprocess_ebuild_env
-- 
cgit v1.2.3-1-g7c22