Merge "Remove python3 usage in bootstrap-ansible.sh" into stable/pike

This commit is contained in:
Jenkins 2017-08-31 17:49:04 +00:00 committed by Gerrit Code Review
commit c9400f2c9e

View File

@ -89,7 +89,7 @@ elif [ -n "$HTTP_PROXY" ]; then
fi fi
# Figure out the version of python is being used # Figure out the version of python is being used
PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python3 || which python2 || which python)}" PYTHON_EXEC_PATH="${PYTHON_EXEC_PATH:-$(which python2 || which python)}"
PYTHON_VERSION="$($PYTHON_EXEC_PATH -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')" PYTHON_VERSION="$($PYTHON_EXEC_PATH -c 'import sys; print(".".join(map(str, sys.version_info[:3])))')"
# Use https when Python with native SNI support is available # Use https when Python with native SNI support is available