From b0528456a606faf996ae8046512d623a6d22d0cc Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 17 May 2023 09:16:41 -0400 Subject: 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 --- scripts/sort-makefile-lines.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py index fd657df970..c0badebf8c 100755 --- a/scripts/sort-makefile-lines.py +++ b/scripts/sort-makefile-lines.py @@ -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) -- cgit 1.4.1