Merge pull request #12054 from Bo98/upgrade-fix

Fix undefined method error following CannotInstallFormulaError
2021-09-14 11:02:04 +01:00 · 2021-09-14 11:02:04 +01:00 · ab281b0553
commit ab281b0553
parent 6139e36731 9d5f4e8ed5
2 changed files with 2 additions and 0 deletions
--- a/Library/Homebrew/install.rb
+++ b/Library/Homebrew/install.rb
@ -299,6 +299,7 @@ module Homebrew
          fi
        rescue CannotInstallFormulaError => e
          ofail e.message
+          nil
        rescue UnsatisfiedRequirements, DownloadError, ChecksumMismatchError => e
          ofail "#{f}: #{e}"
          nil
--- a/Library/Homebrew/upgrade.rb
+++ b/Library/Homebrew/upgrade.rb
@ -73,6 +73,7 @@ module Homebrew
          fi
        rescue CannotInstallFormulaError => e
          ofail e
+          nil
        rescue UnsatisfiedRequirements, DownloadError => e
          ofail "#{formula}: #{e}"
          nil