| 1 |
commit: 3a6d81ff2e6f99df8815719e514f3d30989348fc |
| 2 |
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon May 30 16:13:32 2016 +0000 |
| 4 |
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon May 30 16:13:32 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a6d81ff |
| 7 |
|
| 8 |
catalyst-auto: do not fail if /usr/bin/time is not present. |
| 9 |
|
| 10 |
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> |
| 11 |
|
| 12 |
tools/catalyst-auto | 9 ++++++--- |
| 13 |
1 file changed, 6 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/tools/catalyst-auto b/tools/catalyst-auto |
| 16 |
index e038898..719c3cc 100755 |
| 17 |
--- a/tools/catalyst-auto |
| 18 |
+++ b/tools/catalyst-auto |
| 19 |
@@ -303,6 +303,9 @@ fi |
| 20 |
|
| 21 |
build_failure=0 |
| 22 |
|
| 23 |
+timeprefix="" |
| 24 |
+which time >/dev/null && timeprefix="time" |
| 25 |
+ |
| 26 |
for a in "" ${SETS}; do |
| 27 |
if [ -z "${a}" ]; then |
| 28 |
specs_var="SPECS" |
| 29 |
@@ -314,7 +317,7 @@ for a in "" ${SETS}; do |
| 30 |
|
| 31 |
for i in ${!specs_var}; do |
| 32 |
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 33 |
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 34 |
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 35 |
if [ $? != 0 ]; then |
| 36 |
build_failure=1 |
| 37 |
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" |
| 38 |
@@ -324,7 +327,7 @@ for a in "" ${SETS}; do |
| 39 |
|
| 40 |
for i in ${!optional_specs_var}; do |
| 41 |
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" |
| 42 |
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 43 |
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE} |
| 44 |
if [ $? != 0 ]; then |
| 45 |
build_failure=1 |
| 46 |
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" |
| 47 |
@@ -334,7 +337,7 @@ for a in "" ${SETS}; do |
| 48 |
|
| 49 |
for i in ${!specs_var} ${!optional_specs_var}; do |
| 50 |
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" |
| 51 |
- run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}" |
| 52 |
+ run_cmd "${timeprefix} catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}" |
| 53 |
done |
| 54 |
|
| 55 |
update_symlinks |
Archives