From be6876c79ab99c974d853d6d65f2a36660af8d1a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sat, 10 Sep 2016 21:15:28 +0100 Subject: [PATCH] bottle: fix old_value/value ordering for --merge. Previously this was the wrong way around causing it to not be accepting enough on e.g. a bump from :any to :any_no_relocation. --- Library/Homebrew/dev-cmd/bottle.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index f912109ede..a60d352839 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -383,24 +383,24 @@ module Homebrew bottle_block_contents.lines.each do |line| line = line.strip 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 next unless valid_key - value = value_original.to_s.delete ":'\"" + old_value = old_value_original.to_s.delete ":'\"" tag = tag.to_s.delete ":" if !tag.empty? if !bottle_hash["bottle"]["tags"][tag].to_s.empty? mismatches << "#{key} => #{tag}" else - bottle.send(key, value => tag.to_sym) + bottle.send(key, old_value => tag.to_sym) end next end - old_value_original = bottle_hash["bottle"][key] - old_value = old_value_original.to_s + value_original = bottle_hash["bottle"][key] + value = value_original.to_s next if key == "cellar" && old_value == "any" && value == "any_skip_relocation" if old_value.empty? || value != old_value old_value = old_value_original.inspect