From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SqM3w-0000oD-6o for garchives@archives.gentoo.org; Sun, 15 Jul 2012 10:28:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48C1DE05D7; Sun, 15 Jul 2012 10:28:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 18650E05D7 for ; Sun, 15 Jul 2012 10:28:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7E1EC1B414E for ; Sun, 15 Jul 2012 10:28:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 70030E5434 for ; Sun, 15 Jul 2012 10:28:18 +0000 (UTC) From: "Diego Elio Pettenò" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Diego Elio Pettenò" Message-ID: <1342348085.f8fa9cc0e886ab584f12e77c33471b7d0129d9a2.flameeyes@gentoo> Subject: [gentoo-commits] proj/flameeyes-tinderbox:master commit in: / X-VCS-Repository: proj/flameeyes-tinderbox X-VCS-Files: bashrc X-VCS-Directories: / X-VCS-Committer: flameeyes X-VCS-Committer-Name: Diego Elio Pettenò X-VCS-Revision: f8fa9cc0e886ab584f12e77c33471b7d0129d9a2 X-VCS-Branch: master Date: Sun, 15 Jul 2012 10:28:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 52c27c30-5f98-4784-a71f-de1ee18a6274 X-Archives-Hash: f583960cd7dc5d2cad56fbb19135e75d commit: f8fa9cc0e886ab584f12e77c33471b7d0129d9a2 Author: Diego Elio Petten=C3=B2 flameeyes eu> AuthorDate: Sun Jul 15 10:28:05 2012 +0000 Commit: Diego Elio Petten=C3=B2 gentoo org> CommitDate: Sun Jul 15 10:28:05 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/flameeyes-tin= derbox.git;a=3Dcommit;h=3Df8fa9cc0 Make it more generic and more reliable to pick up autotools failure logs. --- bashrc | 19 ++++++++++++------- 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=3D0 sed -i -e "\$a =3D${CATEGORY}/${PF}" /etc/portage/pac= kage.mask/currentrun =20 - # 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 - <