From 703d2ef0c1ae105b22a25094ce18fbf5a339b974 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 11 May 2020 22:47:03 -0700 Subject: [PATCH] catalyst-auto: print full path to specfile for the email Signed-off-by: Robin H. Johnson --- 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