From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0E2113835A for ; Tue, 12 May 2020 05:47:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 11A22E0916; Tue, 12 May 2020 05:47:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E65A3E0916 for ; Tue, 12 May 2020 05:47:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E10C234FE70 for ; Tue, 12 May 2020 05:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19AAF219 for ; Tue, 12 May 2020 05:47:22 +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: <1589262423.703d2ef0c1ae105b22a25094ce18fbf5a339b974.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: 703d2ef0c1ae105b22a25094ce18fbf5a339b974 X-VCS-Branch: master Date: Tue, 12 May 2020 05:47:22 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 27acb822-b416-4a00-9c11-df3fdf9d6682 X-Archives-Hash: f81965f5aefe4f2a8de1766fe2da4997 commit: 703d2ef0c1ae105b22a25094ce18fbf5a339b974 Author: Robin H. Johnson gentoo org> AuthorDate: Tue May 12 05:47:03 2020 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue May 12 05:47:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=703d2ef0 catalyst-auto: print full path to specfile for the email 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 e6e7f30f..51b0471c 100755 --- a/tools/catalyst-auto +++ b/tools/catalyst-auto @@ -399,7 +399,8 @@ run_catalyst_commands() { for i in ${!specs_var}; do LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" - run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}" + specpath=$(readlink -f "${i}") + run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}" if [[ $? != 0 ]]; then build_failure=1 send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}" @@ -411,7 +412,8 @@ run_catalyst_commands() { for i in ${!optional_specs_var}; do LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log" - run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}" + specpath=$(readlink -f "${i}") + run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}" if [[ $? != 0 ]]; then build_failure=1 send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}" @@ -438,7 +440,8 @@ run_catalyst_commands() { fi for i in ${!specs_var} ${!optional_specs_var}; do LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log" - run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}" + specpath=$(readlink -f "${i}") + run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}" done update_symlinks done