openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2018-03-19 18:39:14 +00:00 committed by Gerrit Code Review
commit a14b78082f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions-common
View File

@ -2304,12 +2304,7 @@ function install_oscwrap {
function cleanup_oscwrap { function cleanup_oscwrap {
local total=0 local total=0
if python3_enabled ; then total=$(cat $OSCWRAP_TIMER_FILE | $PYTHON -c "import sys; print(sum(int(l) for l in sys.stdin))")
local python=python3
else
local python=python
fi
total=$(cat $OSCWRAP_TIMER_FILE | $python -c "import sys; print(sum(int(l) for l in sys.stdin))")
_TIME_TOTAL["osc"]=$total _TIME_TOTAL["osc"]=$total
rm $OSCWRAP_TIMER_FILE rm $OSCWRAP_TIMER_FILE
} }