diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/eutils.eclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/eclass/eutils.eclass b/eclass/eutils.eclass index dbedffe01d4a..aaf195b43c98 100644 --- a/eclass/eutils.eclass +++ b/eclass/eutils.eclass @@ -595,6 +595,8 @@ epatch() { : $(( count++ )) done + (( EPATCH_N_APPLIED_PATCHES++ )) + # if we had to decompress the patch, delete the temp one if [[ -n ${PIPE_CMD} ]] ; then rm -f "${PATCH_TARGET}" @@ -1736,13 +1738,17 @@ epatch_user() { [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check} [[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check} if [[ -d ${EPATCH_SOURCE} ]] ; then + local old_n_applied_patches=${EPATCH_N_APPLIED_PATCHES:-0} EPATCH_SOURCE=${EPATCH_SOURCE} \ EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ epatch echo "${EPATCH_SOURCE}" > "${applied}" - has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" epatch_user_death_notice" + if [[ ${old_n_applied_patches} -lt ${EPATCH_N_APPLIED_PATCHES} ]]; then + has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || \ + EBUILD_DEATH_HOOKS+=" epatch_user_death_notice" + fi return 0 fi done |