diff options
| author | Shaun Jackman | 2016-11-18 16:45:13 -0800 | 
|---|---|---|
| committer | Shaun Jackman | 2016-11-23 10:36:09 -0800 | 
| commit | 8a3481ee1ddd4a01d513f1d3f11dd0ef5821120c (patch) | |
| tree | 9573d451de55a87e975529376f58b07551a2a2f4 /Library/Homebrew/software_spec.rb | |
| parent | 3bcf80f651f8f25db33339782a8b0aed3ad8a3eb (diff) | |
| download | brew-8a3481ee1ddd4a01d513f1d3f11dd0ef5821120c.tar.bz2 | |
Do not remove unknown bottle tags
Diffstat (limited to 'Library/Homebrew/software_spec.rb')
| -rw-r--r-- | Library/Homebrew/software_spec.rb | 19 | 
1 files changed, 9 insertions, 10 deletions
| 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 | 
