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=5cda4e3e18476e959e631575af754f0e1050bceb;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 36f39c6e62..5c931043f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +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. + * pygnulib/GLModuleSystem.py (GLModuleSystem.file_is_module): Likewise. + 2023-05-18 Bruno Haible uchar: Fix error when is included twice. diff --git a/gnulib-tool b/gnulib-tool index 74c395d9a4..91461042cd 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -1815,6 +1815,8 @@ func_sanitize_modulelist () -e '/^TEMPLATE-EXTENDED$/d' \ -e '/^TEMPLATE-TESTS$/d' \ -e '/^\..*/d' \ + -e '/\.orig$/d' \ + -e '/\.rej$/d' \ -e '/~$/d' } diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py index cc9bb27642..87c6dc6048 100644 --- a/pygnulib/GLModuleSystem.py +++ b/pygnulib/GLModuleSystem.py @@ -124,6 +124,8 @@ class GLModuleSystem(object): or filename == 'TEMPLATE-EXTENDED' or filename == 'TEMPLATE-TESTS' or filename.startswith('.') + or filename.endswith('.orig') + or filename.endswith('.rej') or filename.endswith('~')) def list(self):