Browse code

Merge "functions-common: Don't reguess Python versions"

Zuul authored on 2018/03/20 03:39:14
Showing 1 changed files
... ...
@@ -2304,12 +2304,7 @@ function install_oscwrap {
2304 2304
 
2305 2305
 function cleanup_oscwrap {
2306 2306
     local total=0
2307
-    if python3_enabled ; then
2308
-        local python=python3
2309
-    else
2310
-        local python=python
2311
-    fi
2312
-    total=$(cat $OSCWRAP_TIMER_FILE | $python -c "import sys; print(sum(int(l) for l in sys.stdin))")
2307
+    total=$(cat $OSCWRAP_TIMER_FILE | $PYTHON -c "import sys; print(sum(int(l) for l in sys.stdin))")
2313 2308
     _TIME_TOTAL["osc"]=$total
2314 2309
     rm $OSCWRAP_TIMER_FILE
2315 2310
 }