openstack/diskimage-builder
Code Issues Proposed changes

Add $EXTRA_ARGS back to yum call

Browse Source 
This got removed accidentally in a recent consolidation of
install-packages.  Adding it back so that -d support works again.

Closes-bug: #1287142

Change-Id: If17e613bc9bc0f808517edfa1506858d3b9dce54
This commit is contained in:
James Slagle 2014-02-28 09:37:07 -05:00 committed by Derek Higgins
parent e5afa4d6f9
commit 30d1668c03
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ if [ -n "$WHITELIST" ]; then
if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]; then
rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
fi fi
yum -y install $(map-packages $WHITELIST) yum -y install $EXTRA_ARGS $(map-packages $WHITELIST)
for pkg in "$@"; do for pkg in "$@"; do
if [ "$pkg" = "python-pip" ] ; then if [ "$pkg" = "python-pip" ] ; then
alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10 alternatives --install /usr/bin/pip pip /usr/bin/pip-python 10