diff options
| author |   Dror Levin <spatz@gentoo.org> | 2010-01-20 12:57:13 +0000 |
|---|---|---|
| committer | Dror Levin <spatz@gentoo.org> | 2010-01-20 12:57:13 +0000 |
| commit | 406abd1f832fd8efcacd797fea64c0bdef6e9027 (patch) | |
| tree | bf94f91607cc38129c5740957d738a6b672f2ae5 /eclass/base.eclass | |
| parent | Remake nolibx11 patch for 4.6.1. (diff) | |
| download | gentoo-2-406abd1f832fd8efcacd797fea64c0bdef6e9027.tar.gz gentoo-2-406abd1f832fd8efcacd797fea64c0bdef6e9027.tar.bz2 gentoo-2-406abd1f832fd8efcacd797fea64c0bdef6e9027.zip | |
Fix critical bug in base.eclass where patching with PATCHES would silently fail if file does not exist
Diffstat (limited to 'eclass/base.eclass')
| -rw-r--r-- | eclass/base.eclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/base.eclass b/eclass/base.eclass index 3899c615fa62..cb2f332f9092 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.44 2010/01/13 09:51:53 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.45 2010/01/20 12:57:13 spatz Exp $ # @ECLASS: base.eclass # @MAINTAINER: @@ -74,7 +74,6 @@ base_src_prepare() { if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${PATCHES[@]}"; do debug-print "$FUNCNAME: applying patch from ${x}" - [[ -f "${x}" ]] && epatch "${x}" if [[ -d "${x}" ]]; then # Use standardized names and locations with bulk patching # Patch directory is ${WORKDIR}/patch @@ -88,6 +87,8 @@ base_src_prepare() { EPATCH_SOURCE=${x} epatch EPATCH_SOURCE=${oldval} + else + epatch "${x}" fi done else |