| 1 |
--- |
| 2 |
eclass/python-utils-r1.eclass | 16 ++++++++-------- |
| 3 |
1 file changed, 8 insertions(+), 8 deletions(-) |
| 4 |
|
| 5 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 6 |
index 6ff1dd1..1362ff9 100644 |
| 7 |
--- a/eclass/python-utils-r1.eclass |
| 8 |
+++ b/eclass/python-utils-r1.eclass |
| 9 |
@@ -280,12 +280,12 @@ python_export() { |
| 10 |
# sysconfig can't be used because: |
| 11 |
# 1) pypy doesn't give site-packages but stdlib |
| 12 |
# 2) jython gives paths with wrong case |
| 13 |
- export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())') |
| 14 |
+ export PYTHON_SITEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_lib())' || die) |
| 15 |
debug-print "${FUNCNAME}: PYTHON_SITEDIR = ${PYTHON_SITEDIR}" |
| 16 |
;; |
| 17 |
PYTHON_INCLUDEDIR) |
| 18 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
| 19 |
- export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())') |
| 20 |
+ export PYTHON_INCLUDEDIR=$("${PYTHON}" -c 'import distutils.sysconfig; print(distutils.sysconfig.get_python_inc())' || die) |
| 21 |
debug-print "${FUNCNAME}: PYTHON_INCLUDEDIR = ${PYTHON_INCLUDEDIR}" |
| 22 |
|
| 23 |
# Jython gives a non-existing directory |
| 24 |
@@ -295,7 +295,7 @@ python_export() { |
| 25 |
;; |
| 26 |
PYTHON_LIBPATH) |
| 27 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
| 28 |
- export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")') |
| 29 |
+ export PYTHON_LIBPATH=$("${PYTHON}" -c 'import os.path, sysconfig; print(os.path.join(sysconfig.get_config_var("LIBDIR"), sysconfig.get_config_var("LDLIBRARY")) if sysconfig.get_config_var("LDLIBRARY") else "")' || die) |
| 30 |
debug-print "${FUNCNAME}: PYTHON_LIBPATH = ${PYTHON_LIBPATH}" |
| 31 |
|
| 32 |
if [[ ! ${PYTHON_LIBPATH} ]]; then |
| 33 |
@@ -308,7 +308,7 @@ python_export() { |
| 34 |
case "${impl}" in |
| 35 |
python*) |
| 36 |
# python-2.7, python-3.2, etc. |
| 37 |
- val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-}) |
| 38 |
+ val=$($(tc-getPKG_CONFIG) --cflags ${impl/n/n-} || die) |
| 39 |
;; |
| 40 |
*) |
| 41 |
die "${impl}: obtaining ${var} not supported" |
| 42 |
@@ -324,7 +324,7 @@ python_export() { |
| 43 |
case "${impl}" in |
| 44 |
python*) |
| 45 |
# python-2.7, python-3.2, etc. |
| 46 |
- val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-}) |
| 47 |
+ val=$($(tc-getPKG_CONFIG) --libs ${impl/n/n-} || die) |
| 48 |
;; |
| 49 |
*) |
| 50 |
die "${impl}: obtaining ${var} not supported" |
| 51 |
@@ -340,7 +340,7 @@ python_export() { |
| 52 |
case "${impl}" in |
| 53 |
python*) |
| 54 |
[[ -n ${PYTHON} ]] || die "PYTHON needs to be set for ${var} to be exported, or requested before it" |
| 55 |
- flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")') |
| 56 |
+ flags=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("ABIFLAGS") or "")' || die) |
| 57 |
val=${PYTHON}${flags}-config |
| 58 |
;; |
| 59 |
*) |
| 60 |
@@ -579,7 +579,7 @@ python_optimize() { |
| 61 |
if [[ ${f} == /* && -d ${D}${f} ]]; then |
| 62 |
set -- "${D}${f}" "${@}" |
| 63 |
fi |
| 64 |
- done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))') |
| 65 |
+ done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))' || die) |
| 66 |
|
| 67 |
debug-print "${FUNCNAME}: using sys.path: ${*/%/;}" |
| 68 |
fi |
| 69 |
@@ -1128,7 +1128,7 @@ python_fix_shebang() { |
| 70 |
eerror " requested impl: ${EPYTHON}" |
| 71 |
die "${FUNCNAME}: conversion of incompatible shebang requested" |
| 72 |
fi |
| 73 |
- done < <(find "${path}" -type f -print0) |
| 74 |
+ done < <(find "${path}" -type f -print0 || die) |
| 75 |
|
| 76 |
if [[ ! ${any_fixed} ]]; then |
| 77 |
eqawarn "QA warning: ${FUNCNAME}, ${path#${D}} did not match any fixable files." |
| 78 |
-- |
| 79 |
2.6.3 |
Archives