Browse code

Merge "Fixed support python 2 on Fedora 27"

Zuul authored on 2019/03/30 09:45:27
Showing 1 changed files
... ...
@@ -49,16 +49,9 @@ function get_python_exec_prefix {
49 49
     fi
50 50
     $xtrace
51 51
 
52
-    if python3_enabled && [[ "$os_VENDOR" == "CentOS" ]] || \
53
-    [[ "$os_VENDOR" == "Fedora" && $os_RELEASE -gt 26 ]]; then
54
-        # Default Python 3 install prefix changed to /usr/local in Fedora 27:
55
-        # https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
56
-        echo "/usr/local/bin"
57
-    elif is_fedora || is_suse; then
58
-        echo "/usr/bin"
59
-    else
60
-        echo "/usr/local/bin"
61
-    fi
52
+    local PYTHON_PATH=/usr/local/bin
53
+    ( is_fedora && ! python3_enabled ) || is_suse && PYTHON_PATH=/usr/bin
54
+    echo $PYTHON_PATH
62 55
 }
63 56
 
64 57
 # Wrapper for ``pip install`` that only installs versions of libraries