1. devstack
  2. Commit ffd0047afa78bfd4d6576afe1d4b8c79435b158c
Browse code

functions-common: Don't reguess Python versions

We have already established the correct version of Python to use during
installation, either automatically or through user-provided information
(USE_PYTHON3, PYTHON3_VERSION). Don't do it again.

Change-Id: I7bdf2be9a885994bf2c437dd104048a1ff2f6666
Closes-Bug: #1744096

Stephen Finucane authored on 2018/01/19 00:12:29
Showing 1 changed files
functions-common
History View file @ ffd0047
... ... 
@@ -2301,12 +2301,7 @@ function install_oscwrap {
2301 2301
2302 2302 
 function cleanup_oscwrap {
2303 2303 
     local total=0
2304 
-    if python3_enabled ; then
2305 
-        local python=python3
2306 
-    else
2307 
-        local python=python
2308 
-    fi
2309 
-    total=$(cat $OSCWRAP_TIMER_FILE | $python -c "import sys; print(sum(int(l) for l in sys.stdin))")
2304 
+    total=$(cat $OSCWRAP_TIMER_FILE | $PYTHON -c "import sys; print(sum(int(l) for l in sys.stdin))")
2310 2305 
     _TIME_TOTAL["osc"]=$total
2311 2306 
     rm $OSCWRAP_TIMER_FILE
2312 2307 
 }