From 4f2b74a149b7da4f3c81a92865763316e44c05c2 Mon Sep 17 00:00:00 2001 From: Seeker Date: Wed, 23 Dec 2020 09:34:18 -0800 Subject: [PATCH] bottle: fix --merge test failure --- Library/Homebrew/dev-cmd/bottle.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 594f0164e4..dc8955a0f4 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -550,6 +550,9 @@ module Homebrew rebuild: new_bottle_hash["rebuild"], }.each do |key, new_value| old_value = old_bottle_spec.send(key) + next if key == :rebuild && old_value.zero? + next if key == :prefix && old_value == Homebrew::DEFAULT_PREFIX + next if key == :cellar && old_value == Homebrew::DEFAULT_REPOSITORY next if key == :cellar && old_value == :any && new_value == :any_skip_relocation next if old_value.present? && new_value == old_value