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

update: always rescue formula loading

Browse Source 
Closes Homebrew/homebrew#45676.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-11-04 18:25:30 +08:00
parent ec114bb480
commit ffbb1828a2
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/cmd/update.rb
View File

@ -108,7 +108,8 @@ module Homebrew
begin begin
f = Formulary.factory("#{user}/#{repo}/#{newname}") f = Formulary.factory("#{user}/#{repo}/#{newname}")
rescue FormulaUnavailableError, *FormulaVersions::IGNORED_EXCEPTIONS # short term fix to prevent situation like https://github.com/Homebrew/homebrew/issues/45616
rescue Exception
end end
next unless f next unless f
@ -314,7 +315,8 @@ class Updater
end end
old_version = FormulaVersions.new(formula).formula_at_revision(@initial_revision, &:pkg_version) old_version = FormulaVersions.new(formula).formula_at_revision(@initial_revision, &:pkg_version)
next if new_version == old_version next if new_version == old_version
rescue FormulaUnavailableError, *FormulaVersions::IGNORED_EXCEPTIONS => e # short term fix to prevent situation like https://github.com/Homebrew/homebrew/issues/45616
rescue Exception => e
onoe e if ARGV.homebrew_developer? onoe e if ARGV.homebrew_developer?
end end
map[:M] << file map[:M] << file