diff options
| author | ilovezfs | 2018-01-08 07:10:35 -0800 |
|---|---|---|
| committer | GitHub | 2018-01-08 07:10:35 -0800 |
| commit | 987805d3dcd4c8dbc70127399d4ea7aee8e98c21 (patch) | |
| tree | 1585ab44c2f80c7929d6cdbdbce49a20f9cbde75 | |
| parent | 13998f5e6394bff327387ff780c6fb1859c01407 (diff) | |
| parent | dbeebcaef59bdbb472aaeb4038a0fe7958951c35 (diff) | |
| download | brew-987805d3dcd4c8dbc70127399d4ea7aee8e98c21.tar.bz2 | |
Merge pull request #3644 from MikeMcQuaid/upgrade-skip-failed-reqs1.4.3
upgrade: skip formula if upgrade fails due to unsatisfied requirement.
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index cf0bb2759..51fd27a62 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -89,10 +89,14 @@ module Homebrew formulae_to_install.each do |f| Migrator.migrate_if_needed(f) - upgrade_formula(f) - next unless ARGV.include?("--cleanup") - next unless f.installed? - Homebrew::Cleanup.cleanup_formula f + begin + upgrade_formula(f) + next unless ARGV.include?("--cleanup") + next unless f.installed? + Homebrew::Cleanup.cleanup_formula f + rescue UnsatisfiedRequirements => e + onoe "#{f}: #{e}" + end end end |
