scripts: sort-makefile-lines.py

We must return < 0, 0, or > 0 as the result of the comparison function
for cmp_to_key() to work correctly across all comparisons.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Carlos O'Donell 2023-05-17 09:16:41 -04:00
parent c4098bc256
commit b0528456a6

View File

@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2):
# string1 and string2 both share a prefix and
# have a numeric suffix that can be compared.
# Sort order is based on the numeric suffix.
return int(var1.group(1)) > int(var2.group(1))
# If the suffix is the same return 0, otherwise
# > 0 for greater-than, and < 0 for less-than.
# This is equivalent to the numerical difference.
return int(var1.group(1)) - int(var2.group(1))
# Default to strcoll.
return locale.strcoll(string1, string2)