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

Merge pull request #916 from MikeMcQuaid/bottle-old-value

Browse Source 
bottle: fix old_value/value ordering for --merge.
This commit is contained in:
Mike McQuaid 2016-09-11 10:39:58 +01:00 committed by GitHub
commit ad3359b96e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -383,24 +383,24 @@ module Homebrew
bottle_block_contents.lines.each do |line| bottle_block_contents.lines.each do |line|
line = line.strip line = line.strip
next if line.empty? next if line.empty?
key, value_original, _, tag = line.split " ", 4 key, old_value_original, _, tag = line.split " ", 4
valid_key = %w[root_url prefix cellar rebuild sha1 sha256].include? key valid_key = %w[root_url prefix cellar rebuild sha1 sha256].include? key
next unless valid_key next unless valid_key
value = value_original.to_s.delete ":'\"" old_value = old_value_original.to_s.delete ":'\""
tag = tag.to_s.delete ":" tag = tag.to_s.delete ":"
if !tag.empty? if !tag.empty?
if !bottle_hash["bottle"]["tags"][tag].to_s.empty? if !bottle_hash["bottle"]["tags"][tag].to_s.empty?
mismatches << "#{key} => #{tag}" mismatches << "#{key} => #{tag}"
else else
bottle.send(key, value => tag.to_sym) bottle.send(key, old_value => tag.to_sym)
end end
next next
end end
old_value_original = bottle_hash["bottle"][key] value_original = bottle_hash["bottle"][key]
old_value = old_value_original.to_s value = value_original.to_s
next if key == "cellar" && old_value == "any" && value == "any_skip_relocation" next if key == "cellar" && old_value == "any" && value == "any_skip_relocation"
if old_value.empty? || value != old_value if old_value.empty? || value != old_value
old_value = old_value_original.inspect old_value = old_value_original.inspect