Skip to content
Snippets Groups Projects
Commit d0c33b37 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

bottle: use key/value rather than field.

Consistent naming is good.
parent 7fb91531
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment