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

Merge pull request #915 from MikeMcQuaid/bottle-consistency

Browse Source 
bottle: use key/value rather than field.
This commit is contained in:
Mike McQuaid 2016-09-10 20:14:26 +01:00 committed by GitHub
commit 2815485f54
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -289,17 +289,17 @@ module Homebrew
old_spec = f.bottle_specification
if ARGV.include?("--keep-old") && !old_spec.checksums.empty?
mismatches = [:root_url, :prefix, :cellar, :rebuild].select do |field|
old_spec.send(field) != bottle.send(field)
mismatches = [:root_url, :prefix, :cellar, :rebuild].select do |key|
old_spec.send(key) != bottle.send(key)
end
mismatches.delete(:cellar) if old_spec.cellar == :any && bottle.cellar == :any_skip_relocation
unless mismatches.empty?
bottle_path.unlink if bottle_path.exist?
mismatches.map! do |field|
old_value = old_spec.send(field).inspect
value = bottle.send(field).inspect
"#{field}: old: #{old_value}, new: #{value}"
mismatches.map! do |key|
old_value = old_spec.send(key).inspect
value = bottle.send(key).inspect
"#{key}: old: #{old_value}, new: #{value}"
end
odie <<-EOS.undent
@ -405,7 +405,7 @@ module Homebrew
if old_value.empty? || value != old_value
old_value = old_value_original.inspect
value = value_original.inspect
mismatches << "#{field}: old: #{old_value}, new: #{value}"
mismatches << "#{key}: old: #{old_value}, new: #{value}"
end
end