sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid to install a blank list of packages

Browse Source 
There are some situations where the list of packages to install
in a image is blank (packages blacklisted).

Change-Id: I315f97fe619c25b36cf47ed1b7a65936b753312e
This commit is contained in:
Ghe Rivero 2014-07-02 10:55:43 +00:00
parent 4fd84db547
commit 226e92fa4d
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

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