[patch] Show death notice about user applied patches only when we really have applied a user supplied patch

show-death-notice-only-when-user-patches-were-really-applied.patch (text/plain), 1.62 KB, created by Thomas Deutschmann (RETIRED) on 2015-11-05 23:25:19 UTC

diff -rupN old/eclass/eutils.eclass new/eclass/eutils.eclass
--- old/eclass/eutils.eclass	2015-09-29 16:31:02.000000000 +0200
+++ new/eclass/eutils.eclass	2015-11-06 00:05:43.889560480 +0100
@@ -326,6 +326,10 @@ EPATCH_OPTS=""
 #	-E - automatically remove empty files
 # @CODE
 EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
+# @VARIABLE: EPATCH_N_APPLIED_PATCHES
+# @DESCRIPTION:
+# Counter variable which indicates how many patches were applied.
+EPATCH_N_APPLIED_PATCHES=0
 # @VARIABLE: EPATCH_EXCLUDE
 # @DESCRIPTION:
 # List of patches not to apply.	 Note this is only file names,
@@ -634,6 +638,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}"
@@ -709,13 +715,16 @@ 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}
 			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