From 2de2d64907b8dbaeb16998c21b4a5ba702d84478 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 27 Jun 2014 16:10:42 -0500 Subject: [PATCH] Give more detailed information about link errors at install-time --- Library/Homebrew/formula_installer.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 41853554e6..61d7608cb1 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -556,16 +556,23 @@ class FormulaInstaller begin keg.link - rescue Keg::LinkError => e + rescue Keg::ConflictError => e onoe "The `brew link` step did not complete successfully" puts "The formula built, but is not symlinked into #{HOMEBREW_PREFIX}" - puts "You can try again using:" - puts " brew link #{f.name}" + puts e puts puts "Possible conflicting files are:" mode = OpenStruct.new(:dry_run => true, :overwrite => true) keg.link(mode) @show_summary_heading = true + rescue Keg::LinkError => e + onoe "The `brew link` step did not complete successfully" + puts "The formula built, but is not symlinked into #{HOMEBREW_PREFIX}" + puts e + puts + puts "You can try again using:" + puts " brew link #{f.name}" + @show_summary_heading = true rescue Exception => e onoe "An unexpected error occurred during the `brew link` step" puts "The formula built, but is not symlinked into #{HOMEBREW_PREFIX}"