Mercurial > hg > octave-nkf > gnulib-hg
changeset 17888:6f3245c005ea
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.
| author | Pádraig Brady <P@draigBrady.com> |
|---|---|
| date | Tue, 03 Feb 2015 10:27:38 +0000 |
| parents | 0d515569e6aa |
| children | 0a7c65161b49 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-02-03 Pádraig Brady <P@draigBrady.com> + + 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 <P@draigBrady.com> bootstrap: exit immediately upon gnulib-tool failure
--- a/gnulib-tool +++ b/gnulib-tool @@ -1477,7 +1477,7 @@ 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