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

Merge pull request #7721 from reitermarkus/fix-audit-appcast

Browse Source 
Fix failing appcast check.
This commit is contained in:
Markus Reiter 2020-06-10 22:40:50 +02:00 committed by GitHub
commit 1ea9bc3e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Library/Homebrew/cask/audit.rb
View File

@ -310,10 +310,16 @@ module Cask
return if cask.appcast.must_contain == :no_check return if cask.appcast.must_contain == :no_check
appcast_stanza = cask.appcast.to_s appcast_stanza = cask.appcast.to_s
appcast_contents, = curl_output("--compressed", "--user-agent", HOMEBREW_USER_AGENT_FAKE_SAFARI, "--location", appcast_contents, = begin
"--globoff", "--max-time", "5", appcast_stanza) curl_output("--compressed", "--user-agent", HOMEBREW_USER_AGENT_FAKE_SAFARI, "--location",
"--globoff", "--max-time", "5", appcast_stanza)
rescue
add_error "appcast at URL '#{appcast_stanza}' offline or looping"
return
end
version_stanza = cask.version.to_s version_stanza = cask.version.to_s
adjusted_version_stanza = if cask.appcast.configuration.blank? adjusted_version_stanza = if cask.appcast.must_contain.blank?
version_stanza.match(/^[[:alnum:].]+/)[0] version_stanza.match(/^[[:alnum:].]+/)[0]
else else
cask.appcast.must_contain cask.appcast.must_contain
@ -322,8 +328,6 @@ module Cask
add_warning "appcast at URL '#{appcast_stanza}' does not contain"\ add_warning "appcast at URL '#{appcast_stanza}' does not contain"\
" the version number '#{adjusted_version_stanza}':\n#{appcast_contents}" " the version number '#{adjusted_version_stanza}':\n#{appcast_contents}"
rescue
add_error "appcast at URL '#{appcast_stanza}' offline or looping"
end end
def check_github_repository def check_github_repository