| 1 |
mgorny 13/02/26 14:35:13 |
| 2 |
|
| 3 |
Modified: ChangeLog python-r1.eclass |
| 4 |
Log: |
| 5 |
Re-enable split logs, now directly handled by python*_foreach_impl(). |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.688 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.688&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.688&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.687&r2=1.688 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.687 |
| 18 |
retrieving revision 1.688 |
| 19 |
diff -u -r1.687 -r1.688 |
| 20 |
--- ChangeLog 26 Feb 2013 14:34:32 -0000 1.687 |
| 21 |
+++ ChangeLog 26 Feb 2013 14:35:13 -0000 1.688 |
| 22 |
@@ -1,6 +1,9 @@ |
| 23 |
# ChangeLog for eclass directory |
| 24 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.687 2013/02/26 14:34:32 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.688 2013/02/26 14:35:13 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 26 Feb 2013; Michał Górny <mgorny@g.o> python-r1.eclass: |
| 29 |
+ Re-enable split logs, now directly handled by python*_foreach_impl(). |
| 30 |
|
| 31 |
26 Feb 2013; Michał Górny <mgorny@g.o> distutils-r1.eclass: |
| 32 |
Re-use python_parallel_foreach_impl() in distutils-r1. |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.43 eclass/python-r1.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.43&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?rev=1.43&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python-r1.eclass?r1=1.42&r2=1.43 |
| 41 |
|
| 42 |
Index: python-r1.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v |
| 45 |
retrieving revision 1.42 |
| 46 |
retrieving revision 1.43 |
| 47 |
diff -u -r1.42 -r1.43 |
| 48 |
--- python-r1.eclass 26 Feb 2013 14:33:45 -0000 1.42 |
| 49 |
+++ python-r1.eclass 26 Feb 2013 14:35:13 -0000 1.43 |
| 50 |
@@ -1,6 +1,6 @@ |
| 51 |
# Copyright 1999-2013 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.42 2013/02/26 14:33:45 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.43 2013/02/26 14:35:13 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: python-r1 |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -620,8 +620,17 @@ |
| 59 |
local BUILD_DIR=${bdir%%/}-${impl} |
| 60 |
export EPYTHON PYTHON |
| 61 |
|
| 62 |
- einfo "${EPYTHON}: running ${@}" |
| 63 |
- "${@}" |
| 64 |
+ einfo "${EPYTHON}: running ${@}" \ |
| 65 |
+ | tee -a "${T}/build-${EPYTHON}.log" |
| 66 |
+ |
| 67 |
+ # _python_parallel() does redirection internally. |
| 68 |
+ # note: this is a hidden API to avoid writing python_foreach_impl |
| 69 |
+ # twice. do *not* even think of using it anywhere else. |
| 70 |
+ if [[ ${1} == _python_parallel ]]; then |
| 71 |
+ "${@}" |
| 72 |
+ else |
| 73 |
+ "${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log" |
| 74 |
+ fi |
| 75 |
lret=${?} |
| 76 |
|
| 77 |
[[ ${ret} -eq 0 && ${lret} -ne 0 ]] && ret=${lret} |
| 78 |
@@ -655,7 +664,8 @@ |
| 79 |
_python_parallel() { |
| 80 |
( |
| 81 |
multijob_child_init |
| 82 |
- "${@}" |
| 83 |
+ "${@}" 2>&1 | tee -a "${T}/build-${EPYTHON}.log" |
| 84 |
+ exit ${PIPESTATUS[0]} |
| 85 |
) & |
| 86 |
multijob_post_fork |
| 87 |
} |
Archives