openstack/devstack
Code Issues Proposed changes

Merge "Update lib_install_from_git to use column format"

Browse Source
This commit is contained in:
Zuul
2017-11-21 20:04:33 +00:00
committed by Gerrit Code Review
parent 84220d0cef f0cd9a8b08
commit ec31a52560
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/python
View File

@@ -415,11 +415,11 @@ function lib_installed_from_git {
# you the path an editable install was installed from; for example # you the path an editable install was installed from; for example
# in response to something like # in response to something like
# pip install -e 'git+http://git.openstack.org/openstack-dev/bashate#egg=bashate' # pip install -e 'git+http://git.openstack.org/openstack-dev/bashate#egg=bashate'
# pip list shows # pip list --format columns shows
# bashate (0.5.2.dev19, /tmp/env/src/bashate) # bashate 0.5.2.dev19 /tmp/env/src/bashate
# Thus we look for "path after a comma" to indicate we were # Thus we check the third column to see if we're installed from
# installed from some local place # some local place.
pip list 2>/dev/null | grep -- "$name" | grep -q -- ', .*)$' [[ -z $(pip list --format=columns 2>/dev/null | awk "/^$name/ {print \$3}") ]]
} }
# check that everything that's in LIBS_FROM_GIT was actually installed # check that everything that's in LIBS_FROM_GIT was actually installed