Merge pull request #7971 from sjackman/bottle-merge-cellar
bottle --merge: Fix bug with cellar :any
This commit is contained in:
commit
a2b47972a7
@ -446,10 +446,10 @@ module Homebrew
|
|||||||
first
|
first
|
||||||
elsif second.start_with?("/")
|
elsif second.start_with?("/")
|
||||||
second
|
second
|
||||||
elsif cellars.include?(:any)
|
elsif cellars.include?("any")
|
||||||
:any
|
"any"
|
||||||
elsif cellars.include?(:any_skip_relocation)
|
elsif cellars.include?("any_skip_relocation")
|
||||||
:any_skip_relocation
|
"any_skip_relocation"
|
||||||
else
|
else
|
||||||
second
|
second
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user