bottle: no need to set cellar anymore
Fixes: Calling `cellar` in a bottle block is deprecated! Use `brew style --fix` on the formula to update the style or use `sha256` with a `cellar:` argument instead.
This commit is contained in:
parent
b117529985
commit
850df21216
@ -481,15 +481,9 @@ module Homebrew
|
|||||||
|
|
||||||
old_spec = f.bottle_specification
|
old_spec = f.bottle_specification
|
||||||
if args.keep_old? && !old_spec.checksums.empty?
|
if args.keep_old? && !old_spec.checksums.empty?
|
||||||
mismatches = [:root_url, :prefix, :cellar, :rebuild].reject do |key|
|
mismatches = [:root_url, :prefix, :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) ||
|
|
||||||
(old_spec.cellar == cellar &&
|
|
||||||
[:any, :any_skip_relocation].include?(bottle.cellar))
|
|
||||||
mismatches.delete(:cellar)
|
|
||||||
bottle.cellar old_spec.cellar
|
|
||||||
end
|
|
||||||
unless mismatches.empty?
|
unless mismatches.empty?
|
||||||
bottle_path.unlink if bottle_path.exist?
|
bottle_path.unlink if bottle_path.exist?
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user