openstack/devstack
Code Issues Proposed changes

functions-common: Don't reguess Python versions

Browse Source 
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
This commit is contained in:
Stephen Finucane 2018-01-18 15:12:29 +00:00
parent b5841fa5d6
commit ffd0047afa
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

@ -2301,12 +2301,7 @@ function install_oscwrap {
function cleanup_oscwrap {
local total=0
if python3_enabled ; then
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))")
total=$(cat $OSCWRAP_TIMER_FILE | $PYTHON -c "import sys; print(sum(int(l) for l in sys.stdin))")
_TIME_TOTAL["osc"]=$total
rm $OSCWRAP_TIMER_FILE
}