]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool: Ignore autom4te.cache when using GNULIB_TOOL_IMPL=sh+py.
authorCollin Funk <collin.funk1@gmail.com>
Sun, 5 May 2024 06:46:02 +0000 (23:46 -0700)
committerCollin Funk <collin.funk1@gmail.com>
Sun, 5 May 2024 06:46:02 +0000 (23:46 -0700)
Reported by Paul Eggert in:
<https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00061.html>.

* gnulib-tool: Don't compare the autom4te.cache directory since requests
are not sorted in Autoconf version 2.71 and below.

ChangeLog
gnulib-tool

index 4b5b9bad06428d112c22cb8dbc7baa27874f311b..f8e20e06c64549c7a44090b00df83a7cafb977ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2024-05-04  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool: Ignore autom4te.cache when using GNULIB_TOOL_IMPL=sh+py.
+       Reported by Paul Eggert in:
+       <https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00061.html>.
+       * gnulib-tool: Don't compare the autom4te.cache directory since requests
+       are not sorted in Autoconf version 2.71 and below.
+
 2024-05-04  Bruno Haible  <bruno@clisp.org>
 
        readutmp, boot-time: Work around a Cygwin 3.5.3 bug.
index 56c447331818e127c885ff3281a885d7db07cb7b..789fe916a88d0ec6cc4a2b39c98d76a213ff2f71 100755 (executable)
@@ -209,7 +209,7 @@ case "$GNULIB_TOOL_IMPL" in
         else
           diff_options=
         fi
-        diff -r $diff_options --exclude=__pycache__ -q . "$tmp" >/dev/null ||
+        diff -r $diff_options --exclude=__pycache__ --exclude=autom4te.cache -q . "$tmp" >/dev/null ||
           func_fatal_error "gnulib-tool.py produced different files than gnulib-tool.sh! Compare `pwd` and $tmp."
         # Compare the two outputs.
         diff -q "$tmp-sh-out" "$tmp-py-out" >/dev/null ||