From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 95AFA13829C for ; Mon, 30 May 2016 16:13:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A555DE0845; Mon, 30 May 2016 16:13:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4742FE0845 for ; Mon, 30 May 2016 16:13:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0A5D5340A67 for ; Mon, 30 May 2016 16:13:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D0DD95D for ; Mon, 30 May 2016 16:13:40 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1464624812.3a6d81ff2e6f99df8815719e514f3d30989348fc.robbat2@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto X-VCS-Directories: tools/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 3a6d81ff2e6f99df8815719e514f3d30989348fc X-VCS-Branch: master Date: Mon, 30 May 2016 16:13:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8888d8e7-9661-4ef4-a540-7280ad571d04 X-Archives-Hash: 80a28b776519d183595fe9b026571191 commit: 3a6d81ff2e6f99df8815719e514f3d30989348fc Author: Robin H. Johnson gentoo org> AuthorDate: Mon May 30 16:13:32 2016 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon May 30 16:13:32 2016 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a6d81ff catalyst-auto: do not fail if /usr/bin/time is not present. Signed-off-by: Robin H. Johnson gentoo.org> tools/catalyst-auto | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/catalyst-auto b/tools/catalyst-auto index e038898..719c3cc 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -303,6 +303,9 @@ fi build_failure=0 +timeprefix="" +which time >/dev/null && timeprefix="time" + for a in "" ${SETS}; do if [ -z "${a}" ]; then specs_var="SPECS" @@ -314,7 +317,7 @@ for a in "" ${SETS}; do for i in ${!specs_var}; do 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 build_failure=1 send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" @@ -324,7 +327,7 @@ for a in "" ${SETS}; do for i in ${!optional_specs_var}; do 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 build_failure=1 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 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 update_symlinks