diff options
author | 2012-07-15 12:28:05 +0200 | |
---|---|---|
committer | 2012-07-15 12:28:05 +0200 | |
commit | f8fa9cc0e886ab584f12e77c33471b7d0129d9a2 (patch) | |
tree | 32f5cd0e5455e9514f6c9081eb1249a302982c4c | |
parent | Avoid subshell. (diff) | |
download | flameeyes-tinderbox-f8fa9cc0e886ab584f12e77c33471b7d0129d9a2.tar.gz flameeyes-tinderbox-f8fa9cc0e886ab584f12e77c33471b7d0129d9a2.tar.bz2 flameeyes-tinderbox-f8fa9cc0e886ab584f12e77c33471b7d0129d9a2.zip |
Make it more generic and more reliable to pick up autotools failure logs.
-rwxr-xr-x | bashrc | 19 |
1 files changed, 12 insertions, 7 deletions
@@ -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 } |