[gentoo-commits] gentoo-x86 commit in eclass: python.eclass

["Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@gentoo.org>]

arfrever    09/08/02 16:56:42

  Modified:             python.eclass
  Log:
  Add check to ensure that /usr/bin/python and /usr/bin/python-config are scripts.

Revision  Changes    Path
1.57                 eclass/python.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.56&r2=1.57

Index: python.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- python.eclass	1 Aug 2009 22:36:20 -0000	1.56
+++ python.eclass	2 Aug 2009 16:56:41 -0000	1.57
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.56 2009/08/01 22:36:20 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.57 2009/08/02 16:56:41 arfrever Exp $
 
 # @ECLASS: python.eclass
 # @MAINTAINER:
@@ -112,6 +112,14 @@
 # @DESCRIPTION:
 # Make sure PYTHON_ABIS variable has valid value.
 validate_PYTHON_ABIS() {
+	# Ensure that /usr/bin/python and /usr/bin/python-config are scripts.
+	if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper script"* ]]; then
+		die "/usr/bin/python isn't valid script"
+	fi
+	if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then
+		die "/usr/bin/python-config isn't valid script"
+	fi
+
 	# USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4.
 	if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then
 		local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI