Merge pull request #7971 from sjackman/bottle-merge-cellar

bottle --merge: Fix bug with cellar :any
This commit is contained in:
Shaun Jackman 2020-07-10 10:14:59 -07:00 committed by GitHub
commit a2b47972a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

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