From ab5390ae6d8db323420874d1c1334feb77af9cb1 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 22 Apr 2024 13:12:35 +0200 Subject: [PATCH 2/2] gnulib-tool: Fix trouble caused by Python's bytecode cache. Reported by Paul Eggert in . * gnulib-tool: In sh+py mode, ignore the __pycache__ directory during comparison. --- ChangeLog | 8 ++++++++ gnulib-tool | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4a272d326e..462823888d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-04-22 Bruno Haible + + gnulib-tool: Fix trouble caused by Python's bytecode cache. + Reported by Paul Eggert in + . + * gnulib-tool: In sh+py mode, ignore the __pycache__ directory during + comparison. + 2024-04-22 Bruno Haible gnulib-tool.py: Fix trouble caused by Python's bytecode cache. diff --git a/gnulib-tool b/gnulib-tool index 6d430e56e6..85b62883c6 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -199,7 +199,7 @@ case "$GNULIB_TOOL_IMPL" in else diff_options= fi - diff -r $diff_options -q . "$tmp" >/dev/null || + diff -r $diff_options --exclude=__pycache__ -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 || -- 2.34.1