From 969f1dd5eeaacbc4e9d5c570825e0e0d4ed22a94 Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Fri, 19 Mar 2021 17:11:52 +0100 Subject: [PATCH] settings: Handle return code correctly "eval $(python3 script.py)" does not handle the return code correctly and would try to evaluate the complete output of the Python traceback. Temporarily save the output in a variable and check the return code. If the RC is unequal to zero, return the RC and leave the bash script. Signed-off-by: Daniel Schultz --- settings/artix7.sh | 7 ++++++- settings/artix7_200t.sh | 7 ++++++- settings/artix7_50t.sh | 7 ++++++- settings/kintex7.sh | 7 ++++++- settings/zynq7.sh | 7 ++++++- settings/zynq7010.sh | 7 ++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/settings/artix7.sh b/settings/artix7.sh index 67c0a95b..d5f63df3 100644 --- a/settings/artix7.sh +++ b/settings/artix7.sh @@ -33,4 +33,9 @@ export XRAY_ROI_GRID_Y2="51" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env diff --git a/settings/artix7_200t.sh b/settings/artix7_200t.sh index b7010130..4ec566b9 100644 --- a/settings/artix7_200t.sh +++ b/settings/artix7_200t.sh @@ -23,4 +23,9 @@ export XRAY_IOI3_TILES="RIOI3_X105Y9 LIOI3_X0Y9" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env diff --git a/settings/artix7_50t.sh b/settings/artix7_50t.sh index b73d6417..71615145 100644 --- a/settings/artix7_50t.sh +++ b/settings/artix7_50t.sh @@ -32,4 +32,9 @@ export XRAY_ROI_GRID_Y2="51" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env diff --git a/settings/kintex7.sh b/settings/kintex7.sh index a44a0e41..f7c16c87 100644 --- a/settings/kintex7.sh +++ b/settings/kintex7.sh @@ -27,4 +27,9 @@ export XRAY_ROI_GRID_Y2="156" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env diff --git a/settings/zynq7.sh b/settings/zynq7.sh index ddd69c7d..716dd3fc 100644 --- a/settings/zynq7.sh +++ b/settings/zynq7.sh @@ -29,4 +29,9 @@ export XRAY_ROI_GRID_Y2="155" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env diff --git a/settings/zynq7010.sh b/settings/zynq7010.sh index 4160a1cc..4a9a8836 100644 --- a/settings/zynq7010.sh +++ b/settings/zynq7010.sh @@ -29,4 +29,9 @@ export XRAY_ROI_GRID_Y2="51" source $(dirname ${BASH_SOURCE[0]})/../utils/environment.sh -eval $(python3 ${XRAY_UTILS_DIR}/create_environment.py) +env=`python3 ${XRAY_UTILS_DIR}/create_environment.py` +ENV_RET=$? +if [[ $ENV_RET != 0 ]] ; then + return $ENV_RET +fi +eval $env