[gentoo-commits] gentoo-x86 commit in eclass: ChangeLog python-r1.eclass

[Michal Gorny (mgorny)]

mgorny      13/02/26 14:32:49

  Modified:             ChangeLog python-r1.eclass
  Log:
  Make python_foreach_impl() non-fatal, expect explicit die inside or outside.

Revision  Changes    Path
1.685                eclass/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.685&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.685&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.684&r2=1.685

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.684
retrieving revision 1.685
diff -u -r1.684 -r1.685
--- ChangeLog	25 Feb 2013 20:27:27 -0000	1.684
+++ ChangeLog	26 Feb 2013 14:32:49 -0000	1.685
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.684 2013/02/25 20:27:27 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.685 2013/02/26 14:32:49 mgorny Exp $
+
+  26 Feb 2013; Michał Górny <mgorny@g.o> python-r1.eclass:
+  Make python_foreach_impl() non-fatal, expect explicit die inside or outside.
 
   25 Feb 2013; Michał Górny <mgorny@g.o> xorg-2.eclass:
   Bump the emul-linux-x86 blocker to match the new release.



1.41                 eclass/python-r1.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.40&r2=1.41

Index: python-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- python-r1.eclass	30 Jan 2013 10:42:25 -0000	1.40
+++ python-r1.eclass	26 Feb 2013 14:32:49 -0000	1.41
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.40 2013/01/30 10:42:25 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.41 2013/02/26 14:32:49 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -583,8 +583,11 @@
 # @DESCRIPTION:
 # Run the given command for each of the enabled Python implementations.
 # If additional parameters are passed, they will be passed through
-# to the command. If the command fails, python_foreach_impl dies.
-# If necessary, use ':' to force a successful return.
+# to the command.
+#
+# The function will return 0 status if all invocations succeed.
+# Otherwise, the return code from first failing invocation will
+# be returned.
 #
 # For each command being run, EPYTHON, PYTHON and BUILD_DIR are set
 # locally, and the former two are exported to the command environment.
@@ -596,6 +599,7 @@
 
 	local impl
 	local bdir=${BUILD_DIR:-${S}}
+	local ret=0 lret=0
 
 	debug-print "${FUNCNAME}: bdir = ${bdir}"
 	for impl in "${_PYTHON_ALL_IMPLS[@]}"; do
@@ -609,9 +613,14 @@
 			export EPYTHON PYTHON
 
 			einfo "${EPYTHON}: running ${@}"
-			"${@}" || die "${EPYTHON}: ${1} failed"
+			"${@}"
+			lret=${?}
+
+			[[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret}
 		fi
 	done
+
+	return ${ret}
 }
 
 # @FUNCTION: python_export_best