gnulib-tool: Ignore .orig and .rej files under modules/

[Bruno Haible]

I just had a "gnulib-tool --create-testdir ..." command fail after 20 minutes
of processing, due to .orig files with outdated contents, under modules/.
Leftovers of the 'patch' program, of course.

This patch should fix it.


2023-05-18  Bruno Haible  <bruno@clisp.org>

        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/gnulib-tool b/gnulib-tool
index 74c395d9a4..c25ed47d9b 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):