catalyst-auto: do not fail if /usr/bin/time is not present.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
This commit is contained in:
parent
da8eca6283
commit
3a6d81ff2e
|
@ -303,6 +303,9 @@ fi
|
||||||
|
|
||||||
build_failure=0
|
build_failure=0
|
||||||
|
|
||||||
|
timeprefix=""
|
||||||
|
which time >/dev/null && timeprefix="time"
|
||||||
|
|
||||||
for a in "" ${SETS}; do
|
for a in "" ${SETS}; do
|
||||||
if [ -z "${a}" ]; then
|
if [ -z "${a}" ]; then
|
||||||
specs_var="SPECS"
|
specs_var="SPECS"
|
||||||
|
@ -314,7 +317,7 @@ for a in "" ${SETS}; do
|
||||||
|
|
||||||
for i in ${!specs_var}; do
|
for i in ${!specs_var}; do
|
||||||
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
||||||
run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
|
run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
build_failure=1
|
build_failure=1
|
||||||
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
|
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
|
||||||
|
@ -324,7 +327,7 @@ for a in "" ${SETS}; do
|
||||||
|
|
||||||
for i in ${!optional_specs_var}; do
|
for i in ${!optional_specs_var}; do
|
||||||
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
|
||||||
run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
|
run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
build_failure=1
|
build_failure=1
|
||||||
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
|
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
|
||||||
|
@ -334,7 +337,7 @@ for a in "" ${SETS}; do
|
||||||
|
|
||||||
for i in ${!specs_var} ${!optional_specs_var}; do
|
for i in ${!specs_var} ${!optional_specs_var}; do
|
||||||
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
|
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
|
||||||
run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
|
run_cmd "${timeprefix} catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
|
||||||
done
|
done
|
||||||
|
|
||||||
update_symlinks
|
update_symlinks
|
||||||
|
|
Loading…
Reference in a new issue