From a704abc6dc0bfa14672cb4614c67b9dc5c8795ec Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Thu, 24 Dec 2020 11:39:33 +0100 Subject: [PATCH] bottle --merge: check for all cellars --- Library/Homebrew/dev-cmd/bottle.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index dc8955a0f4..e382e3586f 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -552,7 +552,11 @@ module Homebrew 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 && [ + Homebrew::DEFAULT_MACOS_CELLAR, + Homebrew::DEFAULT_MACOS_ARM_CELLAR, + Homebrew::DEFAULT_LINUX_CELLAR, + ].include?(old_value) next if key == :cellar && old_value == :any && new_value == :any_skip_relocation next if old_value.present? && new_value == old_value