From 927271ecc845539581638d78c712e17d11437218 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 7 Aug 2011 23:35:28 +0000 Subject: [PATCH] =?utf8?q?epatch:=20log=20exit=20status=20of=20`patch`=20c?= =?utf8?q?ommand=20#375983=20by=20Toralf=20F=C3=B6rster?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- eclass/eutils.eclass | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index ca429c070704..466a09fa7519 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.359 2011/07/20 05:46:46 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.360 2011/08/07 23:35:28 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -382,9 +382,14 @@ epatch() { echo "PATCH COMMAND: patch -p${count} ${EPATCH_OPTS} < '${PATCH_TARGET}'" echo _epatch_draw_line "***** ${patchname} *****" + patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}" 2>&1 + ret=$? + echo + echo "patch program exited with status ${ret}" + exit ${ret} ) >> "${STDERR_TARGET}" - if (patch -p${count} ${EPATCH_OPTS} --dry-run -f < "${PATCH_TARGET}") >> "${STDERR_TARGET}" 2>&1 ; then + if [ $? -eq 0 ] ; then ( _epatch_draw_line "***** ${patchname} *****" echo @@ -392,6 +397,10 @@ epatch() { echo _epatch_draw_line "***** ${patchname} *****" patch -p${count} ${EPATCH_OPTS} < "${PATCH_TARGET}" 2>&1 + ret=$? + echo + echo "patch program exited with status ${ret}" + exit ${ret} ) >> "${STDERR_TARGET}" if [ $? -ne 0 ] ; then -- 2.26.2