]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: fix handling of patch(1) diagnostics
authorPádraig Brady <P@draigBrady.com>
Tue, 3 Feb 2015 10:27:38 +0000 (10:27 +0000)
committerPádraig Brady <P@draigBrady.com>
Tue, 3 Feb 2015 10:34:47 +0000 (10:34 +0000)
* gnulib-tool: Send diagnostics from patch(1) to stderr,
as otherwise gnulib-tool will reparse that output and attempt
to lookup modules.

ChangeLog
gnulib-tool

index 103fd4963575278ee17cb37680dba577b93d3ecd..2f2e73e0201b4b0ee283db8aa9dd7d714f11df23 100644 (file)
--- 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
index 8aa84b3f9927981435d95b97ddf76ade689b18c3..eb1e5a2d119fc84033eec488df773c64ec12c66c 100755 (executable)
@@ -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