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

Merge pull request #6675 from reitermarkus/cask-deps

Browse Source 
Ensure `@downloaded_path` is not nil.
This commit is contained in:
Markus Reiter 2019-11-02 03:19:19 +01:00 committed by GitHub
commit 5da322d6be
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/cask/installer.rb
View File

@ -148,6 +148,8 @@ module Cask
end end
def download def download
return @downloaded_path if @downloaded_path
odebug "Downloading" odebug "Downloading"
@downloaded_path = Download.new(@cask, force: false, quarantine: quarantine?).perform @downloaded_path = Download.new(@cask, force: false, quarantine: quarantine?).perform
odebug "Downloaded to -> #{@downloaded_path}" odebug "Downloaded to -> #{@downloaded_path}"
@ -167,6 +169,7 @@ module Cask
def primary_container def primary_container
@primary_container ||= begin @primary_container ||= begin
download
UnpackStrategy.detect(@downloaded_path, type: @cask.container&.type, merge_xattrs: true) UnpackStrategy.detect(@downloaded_path, type: @cask.container&.type, merge_xattrs: true)
end end
end end
@ -317,7 +320,7 @@ module Cask
end end
begin begin
graph.tsort - [@cask] @cask_and_formula_dependencies = graph.tsort - [@cask]
rescue TSort::Cyclic rescue TSort::Cyclic
strongly_connected_components = graph.strongly_connected_components.sort_by(&:count) strongly_connected_components = graph.strongly_connected_components.sort_by(&:count)
cyclic_dependencies = strongly_connected_components.last - [@cask] cyclic_dependencies = strongly_connected_components.last - [@cask]