openstack/diskimage-builder
Code Issues Proposed changes

Echo output when pkg-map fails

Browse Source 
When the call to pkg-map fails, it prints the error to stdout. However,
this output is lost when pkg-map is executed in a subshell, so the
actual error is never seen. This change adds an explicit echo so the
error is shown.

Change-Id: Id6f4fae6acadfe2839b408fb2dd11fb65d65df6e
This commit is contained in:
James Slagle 2014-07-08 14:12:51 -04:00
parent 61c192ea3c
commit 3df0a08394
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"