diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-11-17 22:06:18 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-11-17 22:06:18 +0000 |
| commit | c96835b6908aef17211d92cc3022065f6f517842 (patch) | |
| tree | 91551fa67b7985c9ecd7826b53cc383b6338505b /databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh | |
| parent | 0178f9a7425e37edcbc800acbec34dce139128ad (diff) | |
| download | ports-c96835b6908aef17211d92cc3022065f6f517842.tar.gz ports-c96835b6908aef17211d92cc3022065f6f517842.zip | |
databases/cassandra3: update to 3.11.9
The port now uses Python 3 so unexpire it.
PR: 249595
Submitted by: maintainer
Reported by: swills (py27 overview)
Notes
Notes:
svn path=/head/; revision=555590
Diffstat (limited to 'databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh')
| -rw-r--r-- | databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh new file mode 100644 index 000000000000..137c6014c092 --- /dev/null +++ b/databases/cassandra3/files/patch-pylib_cassandra-cqlsh-tests.sh @@ -0,0 +1,44 @@ +--- pylib/cassandra-cqlsh-tests.sh.orig 2020-10-20 17:07:48 UTC ++++ pylib/cassandra-cqlsh-tests.sh +@@ -1,4 +1,4 @@ +-#!/bin/bash -x ++#!/usr/local/bin/bash -x + + ################################ + # +@@ -9,6 +9,8 @@ + WORKSPACE=$1 + PYTHON_VERSION=$2 + JAVA_HOME=$3 ++REPO_DIR=$4 ++PYTHON_CMD=$5 + + if [ "${WORKSPACE}" = "" ]; then + echo "Specify Cassandra source directory" +@@ -48,7 +50,7 @@ fi + + # Loop to prevent failure due to maven-ant-tasks not downloading a jar.. + for x in $(seq 1 3); do +- ant -buildfile ${CASSANDRA_DIR}/build.xml realclean jar ++ ant -buildfile ${CASSANDRA_DIR}/build.xml -Dmaven.repo.local=${REPO_DIR} -Dlocalm2=${REPO_DIR} -Dpycmd=${PYTHON_CMD} realclean jar + RETURN="$?" + if [ "${RETURN}" -eq "0" ]; then + break +@@ -62,7 +64,7 @@ fi + + # Set up venv with dtest dependencies + set -e # enable immediate exit if venv setup fails +-virtualenv --python=$PYTHON_VERSION venv ++virtualenv --python=${PYTHON_CMD} venv + source venv/bin/activate + pip install -r ${CASSANDRA_DIR}/pylib/requirements.txt + pip freeze +@@ -103,7 +105,7 @@ case "${pre_or_post_cdc}" in + ;; + esac + +-ccm start --wait-for-binary-proto ++ccm start --wait-for-binary-proto --root + + cd ${CASSANDRA_DIR}/pylib/cqlshlib/ + |