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

Merge "Echo output when pkg-map fails"

Browse source
This commit is contained in:
Jenkins 2014-07-18 02:43:12 +00:00 committed by Gerrit Code Review
commit a030387d6b
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
elements/opensuse/bin/install-packages
View file

@ -60,7 +60,10 @@ for i in "$@"
do do
PKG_NAME=$i PKG_NAME=$i
if [ -n "$MAP_ELEMENT" ]; then if [ -n "$MAP_ELEMENT" ]; then
PKG_NAME=$(pkg-map --element $MAP_ELEMENT $i) if ! PKG_NAME=$(pkg-map --element $MAP_ELEMENT $i); then
echo "bin/pkg-map error. $PKG_NAME"
exit 1
fi
fi fi
if [[ ! ${BLACKLIST[*]} =~ $PKG_NAME ]]; then if [[ ! ${BLACKLIST[*]} =~ $PKG_NAME ]]; then
WHITELIST+="$i " WHITELIST+="$i "

5
elements/yum/bin/install-packages
View file

@ -57,7 +57,10 @@ for i in "$@"
do do
PKG_NAME=$i PKG_NAME=$i
if [ -n "$MAP_ELEMENT" ]; then if [ -n "$MAP_ELEMENT" ]; then
PKG_NAME=$(pkg-map --element $MAP_ELEMENT $i) if ! PKG_NAME=$(pkg-map --element $MAP_ELEMENT $i); then
echo "bin/pkg-map error. $PKG_NAME"
exit 1
fi
fi fi
if [[ ! ${BLACKLIST[*]} =~ $PKG_NAME ]]; then if [[ ! ${BLACKLIST[*]} =~ $PKG_NAME ]]; then
WHITELIST="$WHITELIST $i" WHITELIST="$WHITELIST $i"