From a2d209ca7029ea155acfdb9c25fd2b47d9392b78 Mon Sep 17 00:00:00 2001 From: adilger Date: Wed, 25 Sep 2002 21:43:12 +0000 Subject: [PATCH] Add more obvious error message after a patch failure, instead of before. --- lustre/extN/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/extN/Makefile.am b/lustre/extN/Makefile.am index 63581e3..8d00b15 100644 --- a/lustre/extN/Makefile.am +++ b/lustre/extN/Makefile.am @@ -99,11 +99,13 @@ patch-stamp: sed-stamp $(EXTNP) else \ echo "If first patch fails, read NOTE in extN/Makefile.am"; \ list='$(EXTNP)'; \ - sed '/i_version/q' $(srcdir)/extN.orig/namei.c | tail -2 | grep extN_mark_inode_dirty >/dev/null && list="$(EXTN_FIXES) $$list"; \ - for p in $$list; do \ + sed '/i_version/q' $(srcdir)/extN.orig/namei.c | tail -2 | \ + grep extN_mark_inode_dirty >/dev/null && list="$(EXTN_FIXES) $$list"; \ + for p in $$list; do \ echo "applying patch $$p"; \ sed $(SUB) $(srcdir)/$$p | \ - (cd $(top_srcdir) && patch -p1) || exit $$?; \ + (cd $(top_srcdir) && patch -p1) || \ + echo "error: read NOTE in extN/Makefile.am" 1>&2 && exit $$?; \ done; \ echo "It is OK if the next patch says it is already applied"; \ echo "applying patch $(srcdir)/extN-2.4.18-exports.diff"; \ -- 1.8.3.1