[gentoo-commits] gentoo-x86 commit in eclass: base.eclass

["Dror Levin (spatz)" <spatz@gentoo.org>]

spatz       10/01/20 12:57:13

  Modified:             base.eclass
  Log:
  Fix critical bug in base.eclass where patching with PATCHES would silently fail if file does not exist

Revision  Changes    Path
1.45                 eclass/base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/base.eclass?r1=1.44&r2=1.45

Index: base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/base.eclass,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- base.eclass	13 Jan 2010 09:51:53 -0000	1.44
+++ base.eclass	20 Jan 2010 12:57:13 -0000	1.45
@@ -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 @@
 	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 @@
 				EPATCH_SOURCE=${x}
 				epatch
 				EPATCH_SOURCE=${oldval}
+			else
+				epatch "${x}"
 			fi
 		done
 	else