From d8abdfa56d4d34f10179e4f585cb6c555a65a743 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 31 Oct 2014 20:54:09 -0500 Subject: Revert "run macports check after failed build instead of before every build" CannotInstallFormulaError is only raised when another version of the formula is linked or any of its dependencies are unlinked, in which case this warning is totally irrelevant. It should be checked after build errors instead. This reverts commit 466d0f718bc2241e830393b384294c21194995e0. --- Library/Homebrew/cmd/install.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Library') diff --git a/Library/Homebrew/cmd/install.rb b/Library/Homebrew/cmd/install.rb index 00be1a2f5..4ddb30f0d 100644 --- a/Library/Homebrew/cmd/install.rb +++ b/Library/Homebrew/cmd/install.rb @@ -111,6 +111,7 @@ module Homebrew check_ppc check_writable_install_location check_xcode + check_macports check_cellar end @@ -138,6 +139,5 @@ module Homebrew # another formula. In that case, don't generate an error, just move on. rescue CannotInstallFormulaError => e ofail e.message - check_macports end end -- cgit v1.2.3