diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-09-19 17:09:05 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-09-19 17:09:05 +0000 |
| commit | 786e8c8ee9a0e8bc1bc0ef8e249af30214e42e48 (patch) | |
| tree | e9f841d8903301269b4bebd12c518d8e7da48c5c /eclass | |
| parent | old (diff) | |
| download | historical-786e8c8ee9a0e8bc1bc0ef8e249af30214e42e48.tar.gz historical-786e8c8ee9a0e8bc1bc0ef8e249af30214e42e48.tar.bz2 historical-786e8c8ee9a0e8bc1bc0ef8e249af30214e42e48.zip | |
epatch: fix EPATCH_USER_EXCLUDE handling when EPATCH_EXCLUDE is not set #522934 by Pavel Šimerda
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index 33bc36cda58f..4ede0562f10c 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.436 2014/07/11 08:21:58 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.437 2014/09/19 17:09:05 vapier Exp $ # @ECLASS: eutils.eclass # @MAINTAINER: @@ -489,7 +489,7 @@ epatch() { fi # Let people filter things dynamically - if [[ -n ${EPATCH_EXCLUDE} ]] ; then + if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then # let people use globs in the exclude eshopts_push -o noglob |