+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.
# 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()