admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

bottle: fix merging .rb files.

Browse Source
This commit is contained in:
Mike McQuaid 2013-09-23 17:30:47 +01:00
parent 3de941f7c8
commit fd49e498fa
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Library/Homebrew/cmd/bottle.rb
View File

@ -27,10 +27,12 @@ BOTTLE_ERB = <<-EOS
<% if revision > 0 %> <% if revision > 0 %>
revision <%= revision %> revision <%= revision %>
<% end %> <% end %>
<% checksums.keys.each do |checksum_type| %> <% checksums.each do |checksum_type, checksum_values| %>
<% checksum, osx = checksums[checksum_type].shift %> <% checksum_values.each do |checksum_value| %>
<% checksum, osx = checksum_value.shift %>
<%= checksum_type %> '<%= checksum %>' => :<%= osx %> <%= checksum_type %> '<%= checksum %>' => :<%= osx %>
<% end %> <% end %>
<% end %>
end end
EOS EOS

3
Library/Homebrew/software_spec.rb
View File

@ -114,7 +114,8 @@ class Bottle < SoftwareSpec
os_versions.sort.reverse.each do |os_version| os_versions.sort.reverse.each do |os_version|
osx = os_version.to_sym osx = os_version.to_sym
checksum = checksum_os_versions[osx] checksum = checksum_os_versions[osx]
checksums[checksum_type] = { checksum => osx } checksums[checksum_type] ||= []
checksums[checksum_type] << { checksum => osx }
end end
end end
checksums checksums