From 8a3481ee1ddd4a01d513f1d3f11dd0ef5821120c Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Fri, 18 Nov 2016 16:45:13 -0800 Subject: Do not remove unknown bottle tags --- Library/Homebrew/software_spec.rb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'Library/Homebrew/software_spec.rb') diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index f368c59b5..de19ce544 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -336,20 +336,19 @@ class BottleSpecification end def checksums - checksums = {} - os_versions = collector.keys - os_versions.map! do |macos| + tags = collector.keys.sort_by do |tag| + # Sort non-MacOS tags below MacOS tags. begin - MacOS::Version.from_symbol macos + MacOS::Version.from_symbol tag rescue - nil + "0.#{tag}" end - end.compact! - os_versions.sort.reverse_each do |os_version| - macos = os_version.to_sym - checksum = collector[macos] + end + checksums = {} + tags.reverse_each do |tag| + checksum = collector[tag] checksums[checksum.hash_type] ||= [] - checksums[checksum.hash_type] << { checksum => macos } + checksums[checksum.hash_type] << { checksum => tag } end checksums end -- cgit v1.2.3