diff options
| author | Pádraig Brady <P@draigBrady.com> | 2015-02-03 10:27:38 +0000 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2015-02-03 10:34:47 +0000 |
| commit | 6c8f206bb39e9d4c322d6f12d532f38c9df2dac3 (patch) | |
| tree | 4573727eeaf34be9bcb1e97eca0d5797eade7531 /gnulib-tool | |
| parent | dd929bcb997454ce32b5b3e834e29b7ac6e2cac7 (diff) | |
| download | gnulib-6c8f206bb39e9d4c322d6f12d532f38c9df2dac3.tar.gz | |
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.
Diffstat (limited to 'gnulib-tool')
| -rwxr-xr-x | gnulib-tool | 2 |
1 files changed, 1 insertions, 1 deletions
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 |