openstack/devstack
Code Issues Proposed changes

Merge "install_pip script fails if pip was not installed"

Browse Source
This commit is contained in:
Jenkins 2013-10-08 15:00:53 +00:00 committed by Gerrit Code Review
commit 1fbff91a2d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/install_pip.sh
View File

@ -50,10 +50,12 @@ GetDistro
echo "Distro: $DISTRO" echo "Distro: $DISTRO"
function get_versions() { function get_versions() {
PIP=$(which pip 2>/dev/null || which pip-python 2>/dev/null) PIP=$(which pip 2>/dev/null || which pip-python 2>/dev/null || true)
if [[ -n $PIP ]]; then if [[ -n $PIP ]]; then
PIP_VERSION=$($PIP --version | awk '{ print $2}') PIP_VERSION=$($PIP --version | awk '{ print $2}')
echo "pip: $PIP_VERSION" echo "pip: $PIP_VERSION"
else
echo "pip: Not Installed"
fi fi
} }