diff options
| author | Dror Levin <spatz@gentoo.org> | 2010-05-26 23:23:38 +0300 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-12 01:39:43 -0700 |
| commit | 65c1a6e0dddf0d99af7adbd41484150d5fc6ef9c (patch) | |
| tree | f7f1bd8c5215758ec7e21c8ec8eb0ba725688c63 /bin/ebuild-helpers/ecompressdir | |
| parent | ef30f84cc7e91bf777f505384dd9869606d4dc5f (diff) | |
| download | portage-65c1a6e0dddf0d99af7adbd41484150d5fc6ef9c.tar.gz portage-65c1a6e0dddf0d99af7adbd41484150d5fc6ef9c.tar.bz2 portage-65c1a6e0dddf0d99af7adbd41484150d5fc6ef9c.zip | |
Make utilities die on failure in EAPI 4, bug 273651
Diffstat (limited to 'bin/ebuild-helpers/ecompressdir')
| -rwxr-xr-x | bin/ebuild-helpers/ecompressdir | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index 5d7fdf04b..fdecaf0a2 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -5,7 +5,7 @@ source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh if [[ -z $1 ]] ; then - vecho "${0##*/}: at least one argument needed" 1>&2 + helpers_die "${0##*/}: at least one argument needed" exit 1 fi @@ -21,7 +21,10 @@ case $1 in shift set -- "${@/%/.ecompress.dir}" set -- "${@/#/${D}}" - exec touch "$@" + touch "$@" + ret=$? + [[ $ret -ne 0 ]] && helpers_die "$0 failed" + exit $? ;; --dequeue) [[ -n $2 ]] && vecho "${0##*/}: --dequeue takes no additional arguments" 1>&2 @@ -32,7 +35,7 @@ case $1 in exit 0 ;; --*) - vecho "${0##*/}: unknown arguments '$*'" + helpers_die "${0##*/}: unknown arguments '$*'" exit 1 ;; esac @@ -132,4 +135,5 @@ for dir in "$@" ; do restore_skip_dirs done +[[ $ret -ne 0 ]] && helpers_die "$0 failed" exit ${ret} |