diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-24 13:43:26 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-24 13:43:26 +0000 |
commit | 864ba4ce9bd911911d7c8a1fcddc4a08355ad0c1 (patch) | |
tree | bea67352593c39a5b25140245c8100e559bc344d /eclass | |
parent | Marking kspread-2.1.0 ~ppc for bug 295884 (diff) | |
download | gentoo-2-864ba4ce9bd911911d7c8a1fcddc4a08355ad0c1.tar.gz gentoo-2-864ba4ce9bd911911d7c8a1fcddc4a08355ad0c1.tar.bz2 gentoo-2-864ba4ce9bd911911d7c8a1fcddc4a08355ad0c1.zip |
Die if some patches fail to be found, but still print out all warnings about missing ones first.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/base.eclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/eclass/base.eclass b/eclass/base.eclass index d589056131f2..2642ff4c123c 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -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/base.eclass,v 1.47 2010/01/22 09:34:04 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.48 2010/01/24 13:43:26 scarabeus Exp $ # @ECLASS: base.eclass # @MAINTAINER: @@ -70,6 +70,8 @@ base_src_prepare() { debug-print-function $FUNCNAME "$@" debug-print "$FUNCNAME: PATCHES=$PATCHES" + local patches_failed=0 + pushd "${S}" > /dev/null if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${PATCHES[@]}"; do @@ -92,8 +94,10 @@ base_src_prepare() { else ewarn "QA: File or directory \"${x}\" does not exist." ewarn "QA: Check your PATCHES array or add missing file/directory." + patches_failed=1 fi done + [[ ${patches_failed} -eq 1 ]] && die "Some patches failed. See above messages." else for x in ${PATCHES}; do debug-print "$FUNCNAME: patching from ${x}" |