From 82cbd93de8f3bd0430774e4967affee32bfc8e99 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Tue, 17 Jan 2017 13:49:20 +0100
Subject: [PATCH] Switch variable name to avoid conflict with conda setup
---
gitlab/functions.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 6826eec..35479da 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -202,8 +202,8 @@ if [ -z "${CONDA_FOLDER}" ]; then
CONDA_FOLDER=/opt/conda
fi
-if [ -z "${CONDA_PREFIX}" ]; then
- CONDA_PREFIX=env
+if [ -z "${VIRTUALENV_PATH}" ]; then
+ VIRTUALENV_PATH=env
fi
if [ -z "${DOCSERVER}" ]; then
@@ -211,7 +211,7 @@ if [ -z "${DOCSERVER}" ]; then
export_env DOCSERVER
fi
-PREFIX=${CI_PROJECT_DIR}/${CONDA_PREFIX}
+PREFIX=${CI_PROJECT_DIR}/${VIRTUALENV_PATH}
if [ "${ARCH}" == "linux" ]; then
# Temporary hack to get building done right with gcc-5 compilers
@@ -252,7 +252,7 @@ check_env DOCSERVER
check_env PYPISERVER
check_env TESTSERVER
check_env CONDA_FOLDER
-check_env CONDA_PREFIX
+check_env VIRTUALENV_PATH
export_env LD_LIBRARY_PATH
export_env BOB_PREFIX_PATH
--
GitLab