mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Merge pull request #2599 from dannon/fix_startup_condaskip
When CONDA_ALREADY_INSTALLED is undefined there's an error due to the…
This commit is contained in:
@@ -10,6 +10,8 @@ done
|
||||
if python -V 2>&1 | grep -q -e 'Anaconda' -e 'Continuum Analytics' ; then
|
||||
SET_VENV=0
|
||||
CONDA_ALREADY_INSTALLED=1
|
||||
else
|
||||
CONDA_ALREADY_INSTALLED=0
|
||||
fi
|
||||
|
||||
DEV_WHEELS=0
|
||||
@@ -128,7 +130,7 @@ if [ $SET_VENV -eq 1 ]; then
|
||||
echo "ERROR: A virtualenv cannot be found. Please create a virtualenv in $GALAXY_VIRTUAL_ENV, or activate one."
|
||||
exit 1
|
||||
fi
|
||||
elif [ $SET_VENV -eq -0 -a $CONDA_ALREADY_INSTALLED -eq 1 ]; then
|
||||
elif [ $SET_VENV -eq 0 -a $CONDA_ALREADY_INSTALLED -eq 1 ]; then
|
||||
echo -e "\e[33mWarning: You have Conda installed. Skipping virtualenv activation. This could cause missing dependencies.\e[0m"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user