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

Merge pull request #7988 from SeekingMeaning/cask-installed

Browse Source 
cask/installer: don't call `installed?` if Formula
This commit is contained in:
Bo Anderson 2020-07-13 12:42:09 +01:00 committed by GitHub
commit f51e280729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/cask/installer.rb
View File

@ -328,8 +328,12 @@ module Cask
def missing_cask_and_formula_dependencies def missing_cask_and_formula_dependencies
collect_cask_and_formula_dependencies.reject do |cask_or_formula| collect_cask_and_formula_dependencies.reject do |cask_or_formula|
(cask_or_formula.try(:installed?) || cask_or_formula.try(:any_version_installed?)) && installed = if cask_or_formula.respond_to?(:any_version_installed?)
(cask_or_formula.respond_to?(:opt_linked?) ? cask_or_formula.opt_linked? : true) cask_or_formula.any_version_installed?
else
cask_or_formula.try(:installed?)
end
installed && (cask_or_formula.respond_to?(:opt_linked?) ? cask_or_formula.opt_linked? : true)
end end
end end