From a5bd7cccf1d93421c21d4560cd90037fb1cdb111 Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Mon, 7 Dec 2020 15:43:44 +0000
Subject: [PATCH] software_spec: make bottle sorting stable.
As `:arm64_big_sur` and `:big_sur` equated to the same version: their
sorting was not consistent. Instead, suffix the tag and use that for
sorting so `:big_sur` is always before `:arm64_big_sur`.
---
Library/Homebrew/software_spec.rb | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index 513efdbafe..a08261c978 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -392,10 +392,9 @@ class BottleSpecification
def checksums
tags = collector.keys.sort_by do |tag|
- # Sort non-MacOS tags below MacOS tags.
-
- OS::Mac::Version.from_symbol tag
+ "#{OS::Mac::Version.from_symbol(tag)}_#{tag}"
rescue MacOSVersionError
+ # Sort non-MacOS tags below MacOS tags.
"0.#{tag}"
end
checksums = {}
--
GitLab