From: Bruno Haible Date: Thu, 18 May 2023 14:03:00 +0000 (+0200) Subject: gnulib-tool: Ignore .orig and .rej files under modules/. X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=f24458a7a93a8f7e4be1788fac115bef5d94e39a;p=gnulib.git gnulib-tool: Ignore .orig and .rej files under modules/. * gnulib-tool (func_sanitize_modulelist): Exclude also files whose name ends in .orig or .rej. * pygnulib/GLModuleSystem.py (GLModuleSystem.file_is_module): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 4b2440fd3d..54397e1377 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-05-18 Bruno Haible + + gnulib-tool: Ignore .orig and .rej files under modules/. + * gnulib-tool (func_sanitize_modulelist): Exclude also files whose name + ends in .orig or .rej. + 2023-05-18 Bruno Haible uchar: Fix error when is included twice. diff --git a/gnulib-tool b/gnulib-tool index 0955333c4f..ae4eaba483 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1809,6 +1809,8 @@ func_sanitize_modulelist () -e '/^TEMPLATE-EXTENDED$/d' \ -e '/^TEMPLATE-TESTS$/d' \ -e '/^\..*/d' \ + -e '/\.orig$/d' \ + -e '/\.rej$/d' \ -e '/~$/d' }