diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-02-06 06:08:51 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-02-06 06:08:51 +0000 |
| commit | e210ba84b1c68ad83e040526fef33b91ebf0eb7f (patch) | |
| tree | 5c9eb3ad7756523ed82fe2e227537b197387c629 | |
| parent | 7014857203ba5b84322eff0760a13d7ee96ab97c (diff) | |
| download | portage-e210ba84b1c68ad83e040526fef33b91ebf0eb7f.tar.gz portage-e210ba84b1c68ad83e040526fef33b91ebf0eb7f.tar.bz2 portage-e210ba84b1c68ad83e040526fef33b91ebf0eb7f.zip | |
Make qa_source and qa_call save the return value and return it. Thanks
to igli for suggesting.
svn path=/main/trunk/; revision=9278
| -rwxr-xr-x | bin/ebuild.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 61799ad88..8601863a0 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -33,22 +33,26 @@ fi qa_source() { local shopts=$(shopt) OLDIFS="$IFS" - source "$@" || return 1 + local retval + source "$@" + retval=$? [[ $shopts != $(shopt) ]] && eqawarn "QA Notice: Global shell options changed and were not restored while sourcing '$*'" [[ "$IFS" != "$OLDIFS" ]] && eqawarn "QA Notice: Global IFS changed and was not restored while sourcing '$*'" - return 0 + return $retval } qa_call() { local shopts=$(shopt) OLDIFS="$IFS" - "$@" || return 1 + local retval + "$@" + retval=$? [[ $shopts != $(shopt) ]] && eqawarn "QA Notice: Global shell options changed and were not restored while calling '$*'" [[ "$IFS" != "$OLDIFS" ]] && eqawarn "QA Notice: Global IFS changed and was not restored while calling '$*'" - return 0 + return $retval } # subshell die support |