summaryrefslogtreecommitdiff
path: root/evergreen/prelude_venv.sh
diff options
context:
space:
mode:
authorRichard Samuels <richard.l.samuels@gmail.com>2021-06-22 10:21:01 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-06-22 18:14:21 +0000
commit7d07ffc36c97d632e59c351d15610e0ff2ffab42 (patch)
tree46a04dfe941001265c485610e0a0d448dedd8b02 /evergreen/prelude_venv.sh
parent2ac9fd6e613332f02636c6a7ec7f6cff4a8d05ab (diff)
downloadmongo-7d07ffc36c97d632e59c351d15610e0ff2ffab42.tar.gz
SERVER-57933 Don't override err exit in prelude_venv.sh
Diffstat (limited to 'evergreen/prelude_venv.sh')
-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
}