openstack/devstack
Code Issues Proposed changes

Fixed support python 2 on Fedora 27

Browse Source 
I7d16194d6ba1391ca31251d5b50cbb8de033fc38 added wrong behavour
on Fedora > 26 and Centos 7 when python3 disabled
pip should install packages in /usr/bin

Closes-Bug: #1820070
Change-Id: I3a8efbc8eb6e311db9c7347577c5d2047ba523a9
This commit is contained in:
Lenny Verkhovsky 2019-03-14 13:19:36 +02:00
parent deadc7c439
commit a30dd1cc96
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