diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-08 17:52:50 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-08 17:52:50 +0000 |
| commit | c6f8fbdaa004c7d97803b92e4c989459df305e99 (patch) | |
| tree | 06ef2834fa85a8062bbc788e6749b3259adc440e /mk | |
| parent | 35381eb38a9bdb45c2dceb62019f6b269dcee0d6 (diff) | |
| download | pkgsrc-c6f8fbdaa004c7d97803b92e4c989459df305e99.tar.gz | |
Print the full path to broken or modified patches that aren't applied.
This also fixes the problem where the names of broken local patches
(in ${LOCALPATCHES}) weren't printed correctly in the error message.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.patch.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/bsd.pkg.patch.mk b/mk/bsd.pkg.patch.mk index e9965a15efc..4c67f28e119 100644 --- a/mk/bsd.pkg.patch.mk +++ b/mk/bsd.pkg.patch.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.patch.mk,v 1.12 2005/06/04 20:56:47 rillig Exp $ +# $NetBSD: bsd.pkg.patch.mk,v 1.13 2005/06/08 17:52:50 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the "patch" phase. @@ -241,7 +241,7 @@ apply-pkgsrc-patches: ${ECHO_MSG} "**************************************"; \ ${ECHO_MSG} "Patch file $$i has been modified"; \ ${ECHO_MSG} "**************************************"; \ - fail="$$fail $$filename"; \ + fail="$$fail $$i"; \ continue; \ fi; }; \ ;; \ @@ -255,11 +255,13 @@ apply-pkgsrc-patches: ${ECHO} "$$i" >> ${_PATCH_COOKIE_TMP:Q}; \ else \ ${ECHO_MSG} "Patch $$i failed"; \ - fail="$$fail $$filename"; \ + fail="$$fail $$i"; \ fi; \ done; \ if ${TEST} -n "$$fail"; then \ ${ECHO_MSG} "Patching failed due to modified or broken patch file(s):"; \ - ${ECHO_MSG} " $$fail"; \ + for i in $$fail; do \ + ${ECHO_MSG} " $$i"; \ + done; \ ${_PKGSRC_PATCH_FAIL}; \ fi |