diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2003-03-11 21:50:43 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2003-03-11 21:50:43 +0000 |
| commit | f90a4cd312ebbe8843172763f29fa7f8fe2970d0 (patch) | |
| tree | ca0e8f593f725f1a7cfd65513ef214db5c6087fd /eclass | |
| parent | repoman fix (diff) | |
| download | gentoo-2-f90a4cd312ebbe8843172763f29fa7f8fe2970d0.tar.gz gentoo-2-f90a4cd312ebbe8843172763f29fa7f8fe2970d0.tar.bz2 gentoo-2-f90a4cd312ebbe8843172763f29fa7f8fe2970d0.zip | |
fix form check on bulk patches
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index b6ffd829b09b..7d294b3c80b0 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.28 2003/03/10 09:32:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.29 2003/03/11 21:50:43 azarah Exp $ # # Author: Martin Schlemmer <azarah@gentoo.org> # @@ -96,6 +96,11 @@ EPATCH_OPTS="" EPATCH_EXCLUDE="" # Change the printed message for a single patch. EPATCH_SINGLE_MSG="" +# Force applying bulk patches even if not following the style: +# +# ??_${ARCH}_foo.${EPATCH_SUFFIX} +# +EPATCH_FORCE="no" # This function is for bulk patching, or in theory for just one # or two patches. @@ -153,7 +158,13 @@ epatch() { elif [ -n "$1" -a -d "$1" ] then - local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" + # Allow no extension if EPATCH_FORCE=yes ... used by vim for example ... + if [ "${EPATCH_FORCE}" = "yes" ] && [ -z "${EPATCH_SUFFIX}" ] + then + local EPATCH_SOURCE="$1/*" + else + local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" + fi else if [ ! -d ${EPATCH_SOURCE} ] then @@ -203,7 +214,8 @@ epatch() { # ???_arch_foo.patch # if [ -f ${x} ] && \ - [ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] + ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ + [ "${EPATCH_FORCE}" = "yes" ]) then local count=0 local popts="${EPATCH_OPTS}" |