From 6c8f206bb39e9d4c322d6f12d532f38c9df2dac3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?P=C3=A1draig=20Brady?=
Date: Tue, 3 Feb 2015 10:27:38 +0000 Subject: [PATCH] gnulib-tool: fix handling of patch(1) diagnostics * gnulib-tool: Send diagnostics from patch(1) to stderr, as otherwise gnulib-tool will reparse that output and attempt to lookup modules. --- ChangeLog | 7 +++++++ gnulib-tool | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 103fd49635..2f2e73e020 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-02-03 Pádraig Brady
+ + gnulib-tool: fix handling of patch(1) diagnostics + * gnulib-tool: Send diagnostics from patch(1) to stderr, + as otherwise gnulib-tool will reparse that output and attempt + to lookup modules. + 2015-02-03 Pádraig Brady
bootstrap: exit immediately upon gnulib-tool failure diff --git a/gnulib-tool b/gnulib-tool index 8aa84b3f99..eb1e5a2d11 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1477,7 +1477,7 @@ func_lookup_file () lkbase=`echo "$lkfile" | sed -e 's,^.*/,,'` rm -f "$tmp/$lkbase" cp "$gnulib_dir/$lkfile" "$tmp/$lkbase" - patch -s "$tmp/$lkbase" < "$local_gnulib_dir/$lkfile.diff" \ + patch -s "$tmp/$lkbase" < "$local_gnulib_dir/$lkfile.diff" >&2 \ || func_fatal_error "patch file $local_gnulib_dir/$lkfile.diff didn't apply cleanly" lookedup_file="$tmp/$lkbase" lookedup_tmp=true -- 2.39.5