bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

gnulib-tool.py: Use case-sensitive sorting for files.


From: Collin Funk
Subject: gnulib-tool.py: Use case-sensitive sorting for files.
Date: Sun, 31 Mar 2024 18:06:52 -0700
User-agent: Mozilla Thunderbird

On 3/31/24 5:32 PM, Collin Funk wrote:
> The top part seems like a sorting issue maybe?

This patch fixes this issue.

I was a bit suspicious of this sorted() call previously, but left it
because I had no proof it was incorrect.

diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index 294a8df979..0adfd8a73c 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -942,7 +942,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
         # Determine the final file lists.
         main_filelist, tests_filelist = \
             self.moduletable.filelist_separately(main_modules, tests_modules)
-        filelist = sorted(set(main_filelist + tests_filelist), key=str.lower)
+        filelist = sorted(set(main_filelist + tests_filelist))
         if not filelist:
             raise GLError(12, None)

This seems to match gnulib-tool.sh line 3562:

     files=`{ echo "$main_files"; echo "$testsrelated_files"; } | sed -e 
"$sed_remove_empty_lines" | LC_ALL=C sort -u`

It seems like there are only a few cases where case-insensitive
sorting would matter, so that is why I only noticed now.

Collin

Attachment: 0001-gnulib-tool.py-Use-case-sensitive-sorting-for-files.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]