diff options
author | Zac Medico <zmedico@gentoo.org> | 2009-03-25 01:23:04 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2009-03-25 01:23:04 +0000 |
commit | f8127b9110ae0b3ac4660284c291c803ce8df992 (patch) | |
tree | 1cd269fafe4f563a9ccd50ae8aebf7975e48eff6 | |
parent | dc86ae0c0d72f7a3b65bf5d329d73ffd409c37b3 (diff) | |
download | portage-f8127b9110ae0b3ac4660284c291c803ce8df992.tar.gz portage-f8127b9110ae0b3ac4660284c291c803ce8df992.tar.bz2 portage-f8127b9110ae0b3ac4660284c291c803ce8df992.zip |
Fix domo and doexe to return non-zero if there are any errors. Thanks to
zong_sharo for reporting.
svn path=/main/trunk/; revision=13182
-rwxr-xr-x | bin/ebuild-helpers/doexe | 9 | ||||
-rwxr-xr-x | bin/ebuild-helpers/domo | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe index 36880477c..9d35c8e0d 100755 --- 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 a7ba5775a..f2ad3eaea 100755 --- 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 |