admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

bottle: allow prefix cellar to be any*

Browse Source
This commit is contained in:
Dawid Dziurla 2019-10-15 20:13:04 +02:00
parent 9e337978d9
commit e19fab86c0
No known key found for this signature in database
GPG Key ID: 7B6D8368172E9B0B
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -367,7 +367,9 @@ module Homebrew
mismatches = [:root_url, :prefix, :cellar, :rebuild].reject do |key| mismatches = [:root_url, :prefix, :cellar, :rebuild].reject do |key|
old_spec.send(key) == bottle.send(key) old_spec.send(key) == bottle.send(key)
end end
if old_spec.cellar == :any && bottle.cellar == :any_skip_relocation if (old_spec.cellar == :any && bottle.cellar == :any_skip_relocation) ||
(old_spec.cellar == cellar &&
[:any, :any_skip_relocation].include?(bottle.cellar))
mismatches.delete(:cellar) mismatches.delete(:cellar)
bottle.cellar :any bottle.cellar :any
end end