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

Merge pull request #6607 from dawidd6/keep-old-but-not-cellar

Browse Source 
bottle: don't keep old cellar
This commit is contained in:
Mike McQuaid 2019-10-21 13:37:17 +01:00 committed by GitHub
commit 333642927b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,9 +367,11 @@ 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 old_spec.cellar
end end
unless mismatches.empty? unless mismatches.empty?
bottle_path.unlink if bottle_path.exist? bottle_path.unlink if bottle_path.exist?