diff options
| -rw-r--r-- | eclass/epatch.eclass | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass index da9364136777..1ea657a3b6f8 100644 --- a/eclass/epatch.eclass +++ b/eclass/epatch.eclass @@ -19,8 +19,6 @@ case ${EAPI:-0} in die "${ECLASS}: banned in EAPI=${EAPI}; use eapply* instead";; esac -inherit estack - # @VARIABLE: EPATCH_SOURCE # @DESCRIPTION: # Default directory to search for patches. @@ -211,13 +209,14 @@ epatch() { # Let people filter things dynamically if [[ -n ${EPATCH_EXCLUDE}${EPATCH_USER_EXCLUDE} ]] ; then # let people use globs in the exclude - eshopts_push -o noglob + local prev_noglob=$(shopt -p -o noglob) + set -o noglob local ex for ex in ${EPATCH_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_EXCLUDE ..." - eshopts_pop + ${prev_noglob} continue 2 fi done @@ -225,12 +224,12 @@ epatch() { for ex in ${EPATCH_USER_EXCLUDE} ; do if [[ ${patchname} == ${ex} ]] ; then einfo " Skipping ${patchname} due to EPATCH_USER_EXCLUDE ..." - eshopts_pop + ${prev_noglob} continue 2 fi done - eshopts_pop + ${prev_noglob} fi if [[ ${SINGLE_PATCH} == "yes" ]] ; then |