Attachment 212181 Details for Bug 244626 – slightly modified do-patch.sh

[patch] slightly modified do-patch.sh

Mk-Scripts-do-patch.sh.patch (text/plain), 1.06 KB, created by Conrad Meyer on 2020-03-06 06:49:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Conrad Meyer

Created: 2020-03-06 06:49:03 UTC

Size: 1.06 KB

patch

obsolete

>Index: Mk/Scripts/do-patch.sh
>===================================================================
>--- Mk/Scripts/do-patch.sh	(revision 521973)
>+++ Mk/Scripts/do-patch.sh	(working copy)
>@@ -60,6 +60,7 @@
> patch_from_directory() {
> 	local dir="$1"
> 	local msg="$2"
>+	local patches_failed=""
> 
> 	if [ -d "${dir}" ]; then
> 		cd "${dir}"
>@@ -83,14 +84,19 @@
> 							PATCHES_APPLIED="${PATCHES_APPLIED} ${i}"
> 						else
> 							${dp_ECHO_MSG} "=> ${msg} patch ${i} failed to apply cleanly."
>-							if [ -n "${PATCHES_APPLIED}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
>-								${dp_ECHO_MSG} "=> Patch(es) ${PATCHES_APPLIED} applied cleanly."
>-							fi
>-							false
>+							patches_failed="${patches_failed} ${i}"
> 						fi
> 						;;
> 				esac
> 			done
>+
>+			if [ -n "${PATCHES_APPLIED}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
>+				${dp_ECHO_MSG} "=> Patch(es) ${PATCHES_APPLIED} applied cleanly."
>+			fi
>+			if [ -n "${patches_failed}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
>+				${dp_ECHO_MSG} "=> Patch(es) ${patches_failed} did NOT applied cleanly."
>+				false
>+			fi
> 		fi
> 	fi
> }

Actions: View | Diff

Attachments on bug 244626: 212181