1 |
arfrever 09/09/05 17:30:08 |
2 |
|
3 |
Modified: python.eclass |
4 |
Log: |
5 |
Improve validate_PYTHON_ABIS(). Improve handling of test failures in python_execute_function(). |
6 |
|
7 |
Revision Changes Path |
8 |
1.70 eclass/python.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.70&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?rev=1.70&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/python.eclass?r1=1.69&r2=1.70 |
13 |
|
14 |
Index: python.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v |
17 |
retrieving revision 1.69 |
18 |
retrieving revision 1.70 |
19 |
diff -u -r1.69 -r1.70 |
20 |
--- python.eclass 31 Aug 2009 23:58:28 -0000 1.69 |
21 |
+++ python.eclass 5 Sep 2009 17:30:08 -0000 1.70 |
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.69 2009/08/31 23:58:28 arfrever Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.70 2009/09/05 17:30:08 arfrever Exp $ |
27 |
|
28 |
# @ECLASS: python.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -127,11 +127,11 @@ |
31 |
fi |
32 |
|
33 |
# USE_${ABI_TYPE^^} and RESTRICT_${ABI_TYPE^^}_ABIS variables hopefully will be included in EAPI >= 4. |
34 |
- if [[ -z "${PYTHON_ABIS}" ]] && has "${EAPI:-0}" 0 1 2 3; then |
35 |
+ if [[ "$(declare -p PYTHON_ABIS 2> /dev/null)" != "declare -x PYTHON_ABIS="* ]] && has "${EAPI:-0}" 0 1 2 3; then |
36 |
local ABI support_ABI supported_PYTHON_ABIS= restricted_ABI |
37 |
PYTHON_ABI_SUPPORTED_VALUES="2.4 2.5 2.6 2.7 3.0 3.1 3.2" |
38 |
|
39 |
- if [[ "$(declare -p USE_PYTHON 2>/dev/null)" == "declare -x USE_PYTHON="* ]]; then |
40 |
+ if [[ "$(declare -p USE_PYTHON 2> /dev/null)" == "declare -x USE_PYTHON="* ]]; then |
41 |
if [[ -z "${USE_PYTHON}" ]]; then |
42 |
die "USE_PYTHON variable is empty" |
43 |
fi |
44 |
@@ -368,11 +368,13 @@ |
45 |
ewarn "${RED}${failure_message}${NORMAL}" |
46 |
fi |
47 |
elif has "${PYTHON_ABI}" ${FAILURE_TOLERANT_PYTHON_ABIS}; then |
48 |
- local ABI enabled_PYTHON_ABIS= |
49 |
- for ABI in ${PYTHON_ABIS}; do |
50 |
- [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}" |
51 |
- done |
52 |
- export PYTHON_ABIS="${enabled_PYTHON_ABIS# }" |
53 |
+ if [[ "${EBUILD_PHASE}" != "test" ]] || ! has test-fail-continue ${FEATURES}; then |
54 |
+ local ABI enabled_PYTHON_ABIS= |
55 |
+ for ABI in ${PYTHON_ABIS}; do |
56 |
+ [[ "${ABI}" != "${PYTHON_ABI}" ]] && enabled_PYTHON_ABIS+=" ${ABI}" |
57 |
+ done |
58 |
+ export PYTHON_ABIS="${enabled_PYTHON_ABIS# }" |
59 |
+ fi |
60 |
if [[ "${quiet}" == "0" ]]; then |
61 |
ewarn "${RED}${failure_message}${NORMAL}" |
62 |
fi |