View | Details | Raw Unified | Return to bug 244626
Collapse All | Expand All

(-)Mk/Scripts/do-patch.sh (-4 / +10 lines)
Lines 60-65 Link Here
60
patch_from_directory() {
60
patch_from_directory() {
61
	local dir="$1"
61
	local dir="$1"
62
	local msg="$2"
62
	local msg="$2"
63
	local patches_failed=""
63
64
64
	if [ -d "${dir}" ]; then
65
	if [ -d "${dir}" ]; then
65
		cd "${dir}"
66
		cd "${dir}"
Lines 83-96 Link Here
83
							PATCHES_APPLIED="${PATCHES_APPLIED} ${i}"
84
							PATCHES_APPLIED="${PATCHES_APPLIED} ${i}"
84
						else
85
						else
85
							${dp_ECHO_MSG} "=> ${msg} patch ${i} failed to apply cleanly."
86
							${dp_ECHO_MSG} "=> ${msg} patch ${i} failed to apply cleanly."
86
							if [ -n "${PATCHES_APPLIED}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
87
							patches_failed="${patches_failed} ${i}"
87
								${dp_ECHO_MSG} "=> Patch(es) ${PATCHES_APPLIED} applied cleanly."
88
							fi
89
							false
90
						fi
88
						fi
91
						;;
89
						;;
92
				esac
90
				esac
93
			done
91
			done
92
93
			if [ -n "${PATCHES_APPLIED}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
94
				${dp_ECHO_MSG} "=> Patch(es) ${PATCHES_APPLIED} applied cleanly."
95
			fi
96
			if [ -n "${patches_failed}" -a "${dp_PATCH_SILENT}" != "yes" ]; then
97
				${dp_ECHO_MSG} "=> Patch(es) ${patches_failed} did NOT applied cleanly."
98
				false
99
			fi
94
		fi
100
		fi
95
	fi
101
	fi
96
}
102
}

Return to bug 244626