openstack
/
devstack
Code Issues Proposed changes

Merge "Fixed support python 2 on Fedora 27"

This commit is contained in:
Zuul 2019-03-30 00:45:27 +00:00 committed by Gerrit Code Review
parent b359b960d2 a30dd1cc96
commit 8ca63acff8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inc/python
View File

@ -49,16 +49,9 @@ function get_python_exec_prefix {
fi
$xtrace
if python3_enabled && [[ "$os_VENDOR" == "CentOS" ]] || \
[[ "$os_VENDOR" == "Fedora" && $os_RELEASE -gt 26 ]]; then
# Default Python 3 install prefix changed to /usr/local in Fedora 27:
# https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
echo "/usr/local/bin"
elif is_fedora || is_suse; then
echo "/usr/bin"
else
echo "/usr/local/bin"
fi
local PYTHON_PATH=/usr/local/bin
( is_fedora && ! python3_enabled ) || is_suse && PYTHON_PATH=/usr/bin
echo $PYTHON_PATH
}
# Wrapper for ``pip install`` that only installs versions of libraries