openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Avoid to install a blank list of packages"

This commit is contained in:
Jenkins 2014-07-30 01:59:45 +00:00 committed by Gerrit Code Review
parent e6c9ba3d1b 226e92fa4d
commit 280513194e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
elements/yum/bin/install-packages
View File

@ -80,11 +80,15 @@ if [ -n "$WHITELIST" ]; then
else
PKGS=$(map-packages $WHITELIST)
fi
echo "Installing $PKGS"
yum -y $ACTION $EXTRA_ARGS $PKGS
for pkg in "$@"; do
if [ "$pkg" = "python-pip" ] ; then
alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10
fi
done
if [ -z "${PKGS}" ]; then
echo "Not running install-packages $ACTION with empty packages list"
else
echo "Running install-packages ${ACTION}. Package list: $PKGS"
yum -y $ACTION $EXTRA_ARGS $PKGS
for pkg in "$@"; do
if [ "$pkg" = "python-pip" ] ; then
alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10
fi
done
fi
fi