summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Samuels <richard.l.samuels@gmail.com>2021-06-22 10:21:01 -0400
committerRichard Samuels <richard.l.samuels@gmail.com>2021-06-25 15:31:33 -0400
commit03c06cbb017a3aa73a8583216534532ff19ec6a0 (patch)
treeacba7fddc57c24c6da54b85d2c547b69ea2d15d5
parent182e090cd84282aa3c2af9b5e2cf959afa092c5f (diff)
downloadmongo-03c06cbb017a3aa73a8583216534532ff19ec6a0.tar.gz
SERVER-57933 Don't override err exit in prelude_venv.sh
(cherry picked from commit 7d07ffc36c97d632e59c351d15610e0ff2ffab42)
-rw-r--r--evergreen/prelude_venv.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/evergreen/prelude_venv.sh b/evergreen/prelude_venv.sh
index 728e097ffe0..d4b65895b1c 100644
--- a/evergreen/prelude_venv.sh
+++ b/evergreen/prelude_venv.sh
@@ -1,5 +1,4 @@
function activate_venv {
- set -e
# check if virtualenv is set up
if [ -d "${workdir}/venv" ]; then
if [ "Windows_NT" = "$OS" ]; then
@@ -10,11 +9,13 @@ function activate_venv {
fi
if [ $? -ne 0 ]; then
echo "Failed to activate virtualenv: $(cat /tmp/activate_error.log)"
+ exit 1
fi
python=python
else
if [ -z "$python" ]; then
echo "\$python is unset. This should never happen"
+ exit 1
fi
python=${python}
fi
@@ -26,5 +27,4 @@ function activate_venv {
fi
echo "python set to $(which $python)"
- set +e
}