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/newins | |
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/newins')
-rwxr-xr-x | bin/ebuild-helpers/newins | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins index 1e11b432e..3d4870f8d 100755 --- a/bin/ebuild-helpers/newins +++ b/bin/ebuild-helpers/newins @@ -2,13 +2,15 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 +source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh + if [[ -z ${T} ]] || [[ -z ${2} ]] ; then - echo "$0: Need two arguments, old file and new file" 1>&2 + helpers_die "$0: Need two arguments, old file and new file" exit 1 fi if [ ! -e "$1" ] ; then - echo "!!! ${0##*/}: $1 does not exist" 1>&2 + helpers_die "!!! ${0##*/}: $1 does not exist" exit 1 fi @@ -18,10 +20,14 @@ case "$EAPI" in cp "$1" "$T/$2" || exit $? ;; *) - cp -P "$1" "$T/$2" || exit $? + cp -P "$1" "$T/$2" + ret=$? + [[ $ret -ne 0 ]] && helpers_die "$0 failed" + exit $ret ;; esac doins "${T}/${2}" ret=$? rm -rf "${T}/${2}" +[[ $ret -ne 0 ]] && helpers_die "$0 failed" exit $ret |