| 1 |
mgorny 13/03/04 19:27:00 |
| 2 |
|
| 3 |
Modified: ChangeLog multibuild.eclass |
| 4 |
Log: |
| 5 |
Print only the "public" part of commands. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.707 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.707&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.707&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.706&r2=1.707 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.706 |
| 18 |
retrieving revision 1.707 |
| 19 |
diff -u -r1.706 -r1.707 |
| 20 |
--- ChangeLog 4 Mar 2013 19:22:13 -0000 1.706 |
| 21 |
+++ ChangeLog 4 Mar 2013 19:27:00 -0000 1.707 |
| 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.706 2013/03/04 19:22:13 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.707 2013/03/04 19:27:00 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 04 Mar 2013; Michał Górny <mgorny@g.o> multibuild.eclass: |
| 29 |
+ Print only the "public" part of commands. |
| 30 |
|
| 31 |
04 Mar 2013; Michał Górny <mgorny@g.o> multibuild.eclass, |
| 32 |
python-r1.eclass: |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
1.3 eclass/multibuild.eclass |
| 37 |
|
| 38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.3&view=markup |
| 39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?rev=1.3&content-type=text/plain |
| 40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multibuild.eclass?r1=1.2&r2=1.3 |
| 41 |
|
| 42 |
Index: multibuild.eclass |
| 43 |
=================================================================== |
| 44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v |
| 45 |
retrieving revision 1.2 |
| 46 |
retrieving revision 1.3 |
| 47 |
diff -u -r1.2 -r1.3 |
| 48 |
--- multibuild.eclass 4 Mar 2013 19:22:13 -0000 1.2 |
| 49 |
+++ multibuild.eclass 4 Mar 2013 19:27:00 -0000 1.3 |
| 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/multibuild.eclass,v 1.2 2013/03/04 19:22:13 mgorny Exp $ |
| 54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multibuild.eclass,v 1.3 2013/03/04 19:27:00 mgorny Exp $ |
| 55 |
|
| 56 |
# @ECLASS: multibuild |
| 57 |
# @MAINTAINER: |
| 58 |
@@ -118,12 +118,23 @@ |
| 59 |
# redirect_alloc_fd accepts files only. so we need to open |
| 60 |
# a random file and then reuse the fd for logger process. |
| 61 |
redirect_alloc_fd log_fd /dev/null |
| 62 |
+ |
| 63 |
+ _multibuild_run() { |
| 64 |
+ # find the first non-private command |
| 65 |
+ local i=1 |
| 66 |
+ while [[ ${!i} == _* ]]; do |
| 67 |
+ (( i += 1 )) |
| 68 |
+ done |
| 69 |
+ |
| 70 |
+ [[ ${i} -le ${#} ]] && einfo "${v}: running ${@:${i}}" |
| 71 |
+ "${@}" |
| 72 |
+ } |
| 73 |
+ |
| 74 |
# bash can't handle ${log_fd} in redirections, |
| 75 |
# we need to use eval to pass fd numbers directly. |
| 76 |
eval " |
| 77 |
exec ${log_fd}> >(exec tee -a \"\${T}/build-\${MULTIBUILD_ID}.log\") |
| 78 |
- einfo \"\${v}: running \${@}\" >&${log_fd} 2>&1 |
| 79 |
- \"\${@}\" >&${log_fd} 2>&1 |
| 80 |
+ _multibuild_run \"\${@}\" >&${log_fd} 2>&1 |
| 81 |
lret=\${?} |
| 82 |
exec ${log_fd}>&- |
| 83 |
" |
Archives