openstack/devstack
Code Issues Proposed changes

Properly get pip version

Browse Source 
The old code was strip()ing the version string instead of split()ing the
version string so we always got the first character of the version
string. This worked fine as long as the pip version was single digit but
as soon as it rolls over to '10.stuff' we will compare:

  pip version 1 (instead of 10) > 6

Which fails bceause 1 is less than six. Instaed we really do want to
compare 10 > 6 so use split on '.' instead.

Change-Id: Ic7d0c04d7fa77774ab2d70fb9d11f182becec553
This commit is contained in:
Clark Boylan 2017-10-20 12:14:29 -07:00
parent 57ddd7c161
commit 065779517f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inc/python
View File

@ -333,7 +333,7 @@ function pip_install {
# packages like setuptools? # packages like setuptools?
local pip_version local pip_version
pip_version=$(python -c "import pip; \ pip_version=$(python -c "import pip; \
print(pip.__version__.strip('.')[0])") print(pip.__version__.split('.')[0])")
if (( pip_version<6 )); then if (( pip_version<6 )); then
die $LINENO "Currently installed pip version ${pip_version} does not" \ die $LINENO "Currently installed pip version ${pip_version} does not" \
"meet minimum requirements (>=6)." "meet minimum requirements (>=6)."