Fix domo and doexe to return non-zero if there are any errors. Thanks to

zong_sharo for reporting. (trunk r13182)

svn path=/main/branches/2.1.6/; revision=13211

diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe
index 36880477c5ecc2437138f9d05cefa45b5fd8ca04..9d35c8e0d98d56fc413a995c04ec9f0bf6fa2b21 100755 (executable)
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@ -14,6 +14,8 @@ if [[ ! -d ${D}${_E_EXEDESTTREE_} ]] ; then
        install -d "${D}${_E_EXEDESTTREE_}"
 fi
 
+ret=0
+
 for x in "$@" ; do
        if [ -L "${x}" ] ; then
                cp "${x}" "${T}"
@@ -24,6 +26,11 @@ for x in "$@" ; do
        else
                mysrc="${x}"
        fi
-       install $EXEOPTIONS "$mysrc" "$D$_E_EXEDESTTREE_" || \
+       if ! install $EXEOPTIONS "$mysrc" "$D$_E_EXEDESTTREE_" ; then
                echo "!!! ${0##*/}: $mysrc does not exist" 1>&2
+               false
+       fi
+       ((ret+=$?))
 done
+
+exit $ret

diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index a7ba5775a9564b19afaffb86cc25a038d730fad7..f2ad3eaea0cbd303071dd90b0f2f087624b7bbf9 100755 (executable)
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -12,6 +12,8 @@ if [ ! -d "${D}${DESTTREE}/share/locale" ] ; then
        install -d "${D}${DESTTREE}/share/locale/"
 fi
 
+ret=0
+
 for x in "$@" ; do
        if [ -e "${x}" ] ; then
                mytiny="${x##*/}"
@@ -22,5 +24,9 @@ for x in "$@" ; do
                install -m0644 "${x}" "${mydir}/${MOPREFIX}.mo"
        else
                echo "!!! ${0##*/}: $x does not exist" 1>&2
+               false
        fi
+       ((ret+=$?))
 done
+
+exit $ret