Make it more generic and more reliable to pick up autotools failure logs.

1 files changed, 12 insertions, 7 deletions

diff --git a/bashrc b/bashrc
index 4ad5bba..c1ae0eb 100755
--- a/bashrc
+++ b/bashrc
@@ -63,13 +63,18 @@ tinderbox_failed() {
     dent_me "${CATEGORY}/${PF} merge #failed$(tinderbox_stats)"
     SANDBOX_ON=0 sed -i -e "\$a =${CATEGORY}/${PF}" /etc/portage/package.mask/currentrun
 
-    # check if this is an automake failure and if so, get the whole log inlined
-    if fgrep -q "/temp/automake.out" "${PORTAGE_LOG_FILE}"; then
-	cat "${T}"/automake.out
-    fi
-    if fgrep -q "/temp/aclocal.out" "${PORTAGE_LOG_FILE}"; then
-	cat "${T}"/aclocal.out
-    fi
+    # check if this is an autotools failure and if so, get the whole log inlined
+    for filename in {autoconf,automake,aclocal}{,-1}; do
+	if fgrep -q "/temp/${filename}.out" "${PORTAGE_LOG_FILE}"; then
+	    cat - <<EOF
+######## ${filename}.out ########
+EOF
+	    cat "${T}"/${filename}.out
+	    cat - <<EOF
+#################################
+EOF
+	fi
+    done
 
     tinderbox_send_log
 }