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

Stop using bash arrays for whitelisting in yum

Browse Source 
Using -n for bash arrays was a little bit bad, and also resulted in
errors when running under set -u. Wean the yum element off the array
and switch to a straight string.

Change-Id: Ifd61fce7dadd5820022e9b2ab42020ba0cb71ce6
This commit is contained in:
Steve Kowalik 2014-05-22 19:05:28 +10:00
parent 273d364fc4
commit e02dbd717b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,16 +34,16 @@ fi
# Packages that aren't available in the distro but requested for installation # Packages that aren't available in the distro but requested for installation
# can be ignored by adding them to the exclude list # can be ignored by adding them to the exclude list
BLACKLIST=$(cat /tmp/yum-blacklist 2>/dev/null || echo "") BLACKLIST=$(cat /tmp/yum-blacklist 2>/dev/null || echo "")
WHITELIST=() WHITELIST=
for i in "$@" for i in "$@"
do do
if [[ ! ${BLACKLIST[*]} =~ $i ]]; then if [[ ! ${BLACKLIST[*]} =~ $i ]]; then
WHITELIST+="$i " WHITELIST="$WHITELIST $i"
else else
echo "The package $i is not available and will not be installed" echo "The package $i is not available and will not be installed"
fi fi
done done
if [ ${#WHITELIST[@]} -eq 0 ]; then 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