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

Merge pull request #6766 from reitermarkus/cask-upgrade

Browse Source 
Rescue more errors during `cask upgrade`.
This commit is contained in:
Mike McQuaid 2019-11-22 09:05:34 +00:00 committed by GitHub
commit 93c231cde5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/cask/cmd/upgrade.rb
View File

@ -46,7 +46,7 @@ module Cask
upgradable_casks.each do |(old_cask, new_cask)| upgradable_casks.each do |(old_cask, new_cask)|
upgrade_cask(old_cask, new_cask) upgrade_cask(old_cask, new_cask)
rescue CaskError => e rescue => e
caught_exceptions << e caught_exceptions << e
next next
end end
@ -103,7 +103,7 @@ module Cask
# If successful, wipe the old Cask from staging # If successful, wipe the old Cask from staging
old_cask_installer.finalize_upgrade old_cask_installer.finalize_upgrade
rescue CaskError => e rescue => e
new_cask_installer.uninstall_artifacts if new_artifacts_installed new_cask_installer.uninstall_artifacts if new_artifacts_installed
new_cask_installer.purge_versioned_files new_cask_installer.purge_versioned_files
old_cask_installer.revert_upgrade if started_upgrade old_cask_installer.revert_upgrade if started_upgrade