From dbeebcaef59bdbb472aaeb4038a0fe7958951c35 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Mon, 8 Jan 2018 14:38:10 +0000 Subject: [PATCH] upgrade: skip formula if upgrade fails. Rather than blocking the rest of the formulae from being installed by `brew upgrade` print the requirement failure messages (already done) and an error stating requirements weren't satisfied and then continue to upgrade the rest of the formulae. --- Library/Homebrew/cmd/upgrade.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index cf0bb27595..51fd27a62b 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