diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-10 15:58:58 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-01-10 15:58:58 +0000 |
| commit | d4f3da80073d24aa3fb99007777938659a3b3a1e (patch) | |
| tree | d721758eaec9110282b69bb4532d91ec1b9622cc /eclass | |
| parent | stable ppc64, bug 299159 (diff) | |
| download | gentoo-2-d4f3da80073d24aa3fb99007777938659a3b3a1e.tar.gz gentoo-2-d4f3da80073d24aa3fb99007777938659a3b3a1e.tar.bz2 gentoo-2-d4f3da80073d24aa3fb99007777938659a3b3a1e.zip | |
Fix the EPATCH_EXCLUDE properly by patch from Griffon26. Also it fixes bug #300360.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index dce36d4c07e9..87297b11bbf6 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -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 @@ epatch() { # 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 |