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

[Tomas Chvatal (scarabeus)]

scarabeus    10/01/10 15:58:58

  Modified:             eutils.eclass
  Log:
  Fix the EPATCH_EXCLUDE properly by patch from Griffon26. Also it fixes bug #300360.

Revision  Changes    Path
1.328                eclass/eutils.eclass

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

Index: eutils.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- eutils.eclass	10 Jan 2010 15:49:01 -0000	1.327
+++ eutils.eclass	10 Jan 2010 15:58:58 -0000	1.328
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.327 2010/01/10 15:49:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.328 2010/01/10 15:58:58 scarabeus Exp $
 
 # @ECLASS: eutils.eclass
 # @MAINTAINER:
@@ -265,14 +265,15 @@
 			# let people use globs in the exclude
 			eshopts_push -o noglob
 
-			local ex skip
+			local ex
 			for ex in ${EPATCH_EXCLUDE} ; do
-				[[ ${patchname} == ${ex} ]] && skip=1
+				if [[ ${patchname} == ${ex} ]] ; then
+					eshopts_pop
+					continue 2
+				fi
 			done
 
 			eshopts_pop
-
-			[[ ${skip} = 1 ]] && continue
 		fi
 
 		if [[ ${SINGLE_PATCH} == "yes" ]] ; then