From da1a18378f846a187e693e399829d324f23437cf Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Dec 2016 11:29:54 +0100
Subject: [PATCH] Only set BOB_PREFIX_PATH if not set by caller
---
gitlab/functions.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index e82893c..ae32a16 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -218,7 +218,10 @@ else
fi
PYVER=py$(echo ${PYTHON_VERSION} | tr -d '.')
-BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER}
+if [ -z "${BOB_PREFIX_PATH}" ]; then
+ # Default on stock installations for our CIs
+ BOB_PREFIX_PATH=${CONDA_FOLDER}/envs/bob-devel-${PYVER}
+fi
LD_LIBRARY_PATH=${BOB_PREFIX_PATH}/lib
if [ -z "${PYPISERVER}" ]; then
--
GitLab