From e2db28834076bf3c5d60e1c40d5f83ba0d852a13 Mon Sep 17 00:00:00 2001 From: Shaun Jackman Date: Thu, 9 Jul 2020 21:10:25 -0700 Subject: [PATCH] bottle --merge: Fix bug with cellar :any When merging cellar, :any ought to have higher priority than :any_skip_relocation. The variables first and second are strings, not tags. --- Library/Homebrew/dev-cmd/bottle.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index b2f510583d..8386d76e3b 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -446,10 +446,10 @@ module Homebrew first elsif second.start_with?("/") second - elsif cellars.include?(:any) - :any - elsif cellars.include?(:any_skip_relocation) - :any_skip_relocation + elsif cellars.include?("any") + "any" + elsif cellars.include?("any_skip_relocation") + "any_skip_relocation" else second end