1. devstack
  2. Commit e991f7da457e0f1343ca13e8adeb0f6334b04990
Browse code

Use bash-style test for Fedora version

Old-style test fails on Ubuntu when python3 enabled, with:

.../devstack/inc/python: line 52: [: 16.04: integer expression expected

Use bash-style test, which doesn't attempt to evaluate the RHS if the
LHS evaluates to false

Change-Id: If18031ab98c9060e5825c3a8d3c647bd3705cd9c
Closes-Bug: #1796174

imacdonn authored on 2018/10/05 04:41:59
Showing 1 changed files
inc/python
History View file @ e991f7d
... ... 
@@ -49,7 +49,7 @@ function get_python_exec_prefix {
49 49 
     fi
50 50 
     $xtrace
51 51
52 
-    if python3_enabled && [ "$os_VENDOR" = "Fedora" -a $os_RELEASE -gt 26 ]; then
52 
+    if python3_enabled && [[ "$os_VENDOR" == "Fedora" && $os_RELEASE -gt 26 ]]; then
53 53 
         # Default Python 3 install prefix changed to /usr/local in Fedora 27:
54 54 
         # https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe
55 55 
         echo "/usr/local/bin"