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.60) (envelope-from ) id 1M16cw-0007AS-8L for garchives@archives.gentoo.org; Mon, 04 May 2009 22:27:10 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA5E5E04B1; Mon, 4 May 2009 22:27:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 83104E04B1 for ; Mon, 4 May 2009 22:27:09 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 29AAC65B3A for ; Mon, 4 May 2009 22:27:09 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1M16cr-0004tv-Ij for gentoo-commits@lists.gentoo.org; Mon, 04 May 2009 22:27:07 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Mon, 04 May 2009 22:27:05 +0000 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: 17107d27-cad1-4b26-8ffe-15acdc958598 X-Archives-Hash: 06cfdd48e9e268ded1fe1bd28b64e6a2 vapier 09/05/04 22:27:05 Modified: autotools.eclass Log: simplify log handling in autotools_run_tool and include the pwd in the = log header Revision Changes Path 1.85 eclass/autotools.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.85&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.85&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?r1=3D1.84&r2=3D1.85 Index: autotools.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- autotools.eclass 12 Apr 2009 07:38:33 -0000 1.84 +++ autotools.eclass 4 May 2009 22:27:05 -0000 1.85 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.84 2009/0= 4/12 07:38:33 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.85 2009/0= 5/04 22:27:05 vapier Exp $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -241,23 +241,26 @@ ewarn "QA Warning: running $1 in ${EBUILD_PHASE} phase" fi =20 - local STDERR_TARGET=3D"${T}/$$.out" - local ris + local STDERR_TARGET=3D"${T}/$1.out" + # most of the time, there will only be one run, but if there are + # more, make sure we get unique log filenames + if [[ -e ${STDERR_TARGET} ]] ; then + STDERR_TARGET=3D"${T}/$1-$$.out" + fi =20 - printf "***** $1 *****\n***** $*\n\n" > "${STDERR_TARGET%/*}/$1-${STDER= R_TARGET##*/}" + printf "***** $1 *****\n***** PWD: ${PWD}\n***** $*\n\n" > "${STDERR_TA= RGET}" =20 ebegin "Running $@" - "$@" >> "${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}" 2>&1 - ris=3D$? - eend ${ris} + "$@" >> "${STDERR_TARGET}" 2>&1 + eend $? =20 - if [[ ${ris} !=3D 0 && ${NO_FAIL} !=3D 1 ]]; then + if [[ $? !=3D 0 && ${NO_FAIL} !=3D 1 ]] ; then echo eerror "Failed Running $1 !" eerror eerror "Include in your bugreport the contents of:" eerror - eerror " ${STDERR_TARGET%/*}/$1-${STDERR_TARGET##*/}" + eerror " ${STDERR_TARGET}" echo die "Failed Running $1 !" fi