From b73f7aad6c3c2fad0cff7bd87ed916499aee28d4 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sun, 24 Mar 2024 16:09:34 -0700 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ pygnulib/GLImport.py | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cfb10d1821..0693acfc13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2024-03-24 Collin Funk + + 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 gnulib-tool.py: Use Python raw strings for regular expressions. diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index bf915341ea..e8c8231886 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -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() -- 2.39.5