Merge pull request #9448 from MikeMcQuaid/bottle_checksum_sorting

software_spec: make bottle sorting stable.
This commit is contained in:
Mike McQuaid 2020-12-07 16:26:43 +00:00 committed by GitHub
commit 20af7ee11f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -392,10 +392,9 @@ class BottleSpecification
def checksums def checksums
tags = collector.keys.sort_by do |tag| tags = collector.keys.sort_by do |tag|
# Sort non-MacOS tags below MacOS tags. "#{OS::Mac::Version.from_symbol(tag)}_#{tag}"
OS::Mac::Version.from_symbol tag
rescue MacOSVersionError rescue MacOSVersionError
# Sort non-MacOS tags below MacOS tags.
"0.#{tag}" "0.#{tag}"
end end
checksums = {} checksums = {}