[PATCH] gnulib-tool: fix handling of patch(1) diagnostics

[PATCH] gnulib-tool: fix handling of patch(1) diagnostics

[Pádraig Brady]

* 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 103fd49..2f2e73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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
 	* build-aux/bootstrap: Exit immediately if gnulib-tool fails.
 	This was noticed when gnulib-tool exited early due to failure
diff --git a/gnulib-tool b/gnulib-tool
index 8aa84b3..eb1e5a2 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.1.0