openstack/devstack
Code Issues Proposed changes

Use 'python_version', 'python3_version' functions

Browse Source 
It looks like this was missed in the original change [1]. There's a
small typo in one of the functions so this is corrected.

[1] Id826f275b99b9f397b95e817941019fc503daa1d

Change-Id: I92fb3eeb5a111c4c5a55ac4293611fa308e9ee11
This commit is contained in:
Stephen Finucane
2018-01-18 15:15:29 +00:00
parent ffd0047afa
commit 651a7336ad
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
functions-common
View File

@@ -2125,7 +2125,7 @@ function python_version {
function python3_version {
local python3_version
python3_version=$(_get_python_version python3)
echo "python${python_version}"
echo "python${python3_version}"
}

4
stackrc
View File

@@ -130,11 +130,11 @@ export DISABLED_PYTHON3_PACKAGES=""
# When Python 3 is supported by an application, adding the specific
# version of Python 3 to this variable will install the app using that
# version of the interpreter instead of 2.7.
_DEFAULT_PYTHON3_VERSION="$(_get_python_version python3)"
_DEFAULT_PYTHON3_VERSION="$(python3_version)"
export PYTHON3_VERSION=${PYTHON3_VERSION:-${_DEFAULT_PYTHON3_VERSION:-3.5}}
# Just to be more explicit on the Python 2 version to use.
_DEFAULT_PYTHON2_VERSION="$(_get_python_version python2)"
_DEFAULT_PYTHON2_VERSION="$(python_version)"
export PYTHON2_VERSION=${PYTHON2_VERSION:-${_DEFAULT_PYTHON2_VERSION:-2.7}}
# allow local overrides of env variables, including repo config