From 30c2ea0c3e61db387e7c31ecb7fd18216c0e083e Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 23 Mar 2018 12:02:41 -0400 Subject: [PATCH] Make psycopg2 grep a little more robust --- scripts/common_startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh index 4bc88b8cb8eb..abdcd60fe39f 100755 --- a/scripts/common_startup.sh +++ b/scripts/common_startup.sh @@ -187,7 +187,7 @@ if [ $FETCH_WHEELS -eq 1 ]; then pip install $requirement_args --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url "${PYPI_INDEX_URL}" GALAXY_CONDITIONAL_DEPENDENCIES=$(PYTHONPATH=lib python -c "from __future__ import print_function; import galaxy.dependencies; print('\n'.join(galaxy.dependencies.optional('$GALAXY_CONFIG_FILE')))") if [ -n "$GALAXY_CONDITIONAL_DEPENDENCIES" ]; then - if pip list | grep "psycopg2 (2.7.3)"; then + if pip list | grep "psycopg2[\(\ ]*2.7.3"; then echo "An older version of psycopg2 (non-binary, version 2.7.3) has been detected. Galaxy now uses psycopg2-binary, which will be installed after removing psycopg2." pip uninstall -y psycopg2==2.7.3 fi