Make qa_source and qa_call save the return value and return it. Thanks

to igli for suggesting. (trunk r9278)

svn path=/main/branches/2.1.2/; revision=9304

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index eca24c626834b3ed5cdef6c02e0db8aa0682c765..37a9a6ed296de90416b830e38034f024b1a46e50 100755 (executable)
--- 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