diff options
| author | Mike McQuaid | 2013-09-23 17:30:47 +0100 |
|---|---|---|
| committer | Mike McQuaid | 2013-09-23 17:30:56 +0100 |
| commit | fd49e498fac9d048b99165fb4854be396e1067dc (patch) | |
| tree | 4b4c7dee8d85f81e76af7c9d325c743dd6f6700d /Library/Homebrew | |
| parent | 3de941f7c80192998424ebd19617db574ce09518 (diff) | |
| download | brew-fd49e498fac9d048b99165fb4854be396e1067dc.tar.bz2 | |
bottle: fix merging .rb files.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/bottle.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/software_spec.rb | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb index 9255364a9..9b45e3b6d 100644 --- a/Library/Homebrew/cmd/bottle.rb +++ b/Library/Homebrew/cmd/bottle.rb @@ -27,10 +27,12 @@ BOTTLE_ERB = <<-EOS <% if revision > 0 %> revision <%= revision %> <% end %> - <% checksums.keys.each do |checksum_type| %> - <% checksum, osx = checksums[checksum_type].shift %> + <% checksums.each do |checksum_type, checksum_values| %> + <% checksum_values.each do |checksum_value| %> + <% checksum, osx = checksum_value.shift %> <%= checksum_type %> '<%= checksum %>' => :<%= osx %> <% end %> + <% end %> end EOS diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb index 5301c0c02..a4f4f56f3 100644 --- a/Library/Homebrew/software_spec.rb +++ b/Library/Homebrew/software_spec.rb @@ -114,7 +114,8 @@ class Bottle < SoftwareSpec os_versions.sort.reverse.each do |os_version| osx = os_version.to_sym checksum = checksum_os_versions[osx] - checksums[checksum_type] = { checksum => osx } + checksums[checksum_type] ||= [] + checksums[checksum_type] << { checksum => osx } end end checksums |