[gentoo-commits] portage r9278 - main/trunk/bin

[Zac Medico (zmedico)]

Author: zmedico
Date: 2008-02-06 06:08:51 +0000 (Wed, 06 Feb 2008)
New Revision: 9278

Modified:
   main/trunk/bin/ebuild.sh
Log:
Make qa_source and qa_call save the return value and return it. Thanks
to igli for suggesting.


Modified: main/trunk/bin/ebuild.sh
===================================================================
--- main/trunk/bin/ebuild.sh	2008-02-05 21:29:15 UTC (rev 9277)
+++ main/trunk/bin/ebuild.sh	2008-02-06 06:08:51 UTC (rev 9278)
@@ -33,22 +33,26 @@
 
 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

-- 
gentoo-commits@l.g.o mailing list