]> Savannah Git Hosting - gnulib.git/commitdiff
gnulib-tool.py: Fix filetable construction for ignorelist.
authorCollin Funk <collin.funk1@gmail.com>
Sun, 24 Mar 2024 23:09:34 +0000 (16:09 -0700)
committerBruno Haible <bruno@clisp.org>
Mon, 25 Mar 2024 00:10:20 +0000 (01:10 +0100)
* pygnulib/GLImport.py (GLImport.execute): Fix typo in dictionary key
that overwrites removed files. Sort ignorelist by directory.

ChangeLog
pygnulib/GLImport.py

index cfb10d18211d7a92ee68d9e2598a3eb0b66dd816..0693acfc130ba1d9650c58d55689494778299519 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-03-24  Collin Funk  <collin.funk1@gmail.com>
+
+       gnulib-tool.py: Fix filetable construction for ignorelist.
+       * pygnulib/GLImport.py (GLImport.execute): Fix typo in dictionary key
+       that overwrites removed files. Sort ignorelist by directory.
+
 2024-03-24  Bruno Haible  <bruno@clisp.org>
 
        gnulib-tool.py: Use Python raw strings for regular expressions.
index bf915341ea12a21f6b048800962559ac893882bf..e8c8231886013ccb631c3dc5f3d8b63cd8499344 100644 (file)
@@ -1393,13 +1393,15 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
             # Treat gnulib-comp.m4 like an added file, even if it already existed.
             filetable['added'] += [joinpath(m4base, 'gnulib-comp.m4')]
             filetable['added'] = sorted(set(filetable['added']))
-            filetable['removed'] = sorted(set(filetable['added']))
+            filetable['removed'] = sorted(set(filetable['removed']))
             for file in filetable['added']:
                 directory, basename = os.path.split(file)
                 ignorelist += [tuple([directory, '|A|', basename])]
             for file in filetable['removed']:
                 directory, basename = os.path.split(file)
                 ignorelist += [tuple([directory, '|R|', basename])]
+            # Sort ignorelist by directory.
+            ignorelist = sorted(ignorelist, key=lambda row: row[0])
             last_dir = ''
             last_dir_files_added = list()
             last_dir_files_removed = list()