1 |
arfrever 09/08/02 16:56:42 |
2 |
|
3 |
Modified: python.eclass |
4 |
Log: |
5 |
Add check to ensure that /usr/bin/python and /usr/bin/python-config are scripts. |
6 |
|
7 |
Revision Changes Path |
8 |
1.57 eclass/python.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.57&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.57&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.56&r2=1.57 |
13 |
|
14 |
Index: python.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
17 |
retrieving revision 1.56 |
18 |
retrieving revision 1.57 |
19 |
diff -u -r1.56 -r1.57 |
20 |
--- python.eclass 1 Aug 2009 22:36:20 -0000 1.56 |
21 |
+++ python.eclass 2 Aug 2009 16:56:41 -0000 1.57 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2009 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.56 2009/08/01 22:36:20 arfrever Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.57 2009/08/02 16:56:41 arfrever Exp $ |
27 |
|
28 |
# @ECLASS: python.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -112,6 +112,14 @@ |
31 |
# @DESCRIPTION: |
32 |
# Make sure PYTHON_ABIS variable has valid value. |
33 |
validate_PYTHON_ABIS() { |
34 |
+ # Ensure that /usr/bin/python and /usr/bin/python-config are scripts. |
35 |
+ if [[ "$(</usr/bin/python)" != *"Gentoo Python wrapper script"* ]]; then |
36 |
+ die "/usr/bin/python isn't valid script" |
37 |
+ fi |
38 |
+ if [[ "$(</usr/bin/python-config)" != *"Gentoo python-config wrapper script"* ]]; then |
39 |
+ die "/usr/bin/python-config isn't valid script" |
40 |
+ fi |
41 |
+ |
42 |
# USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4. |
43 |
if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then |
44 |
local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI |