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.
This commit is contained in:
Shaun Jackman 2020-07-09 21:10:25 -07:00
parent a1f4433d17
commit e2db288340

View File

@ -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