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

Merge pull request #5365 from iMichka/bottle

Browse Source 
brew bottle --keep-old: Combining :any and :any_skip_relocation yields :any
This commit is contained in:
Shaun Jackman 2018-12-04 08:56:14 -08:00 committed by GitHub
commit 81021e6a60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,7 +406,10 @@ 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
mismatches.delete(:cellar) if old_spec.cellar == :any && bottle.cellar == :any_skip_relocation if old_spec.cellar == :any && bottle.cellar == :any_skip_relocation
mismatches.delete(:cellar)
bottle.cellar :any
end
unless mismatches.empty? unless mismatches.empty?
bottle_path.unlink if bottle_path.exist? bottle_path.unlink if bottle_path.exist?