aboutsummaryrefslogtreecommitdiffstats
path: root/Library
diff options
context:
space:
mode:
authorAdam Vandenberg2013-06-23 16:32:31 -0700
committerAdam Vandenberg2013-06-24 07:31:44 -0700
commit1aabba7b9e5ec9d3c3e1e5021236d4d006c97915 (patch)
tree47521da36510e953443a36e4ce21f0fd740a6241 /Library
parent59e6249862e0439aa047ba1d6af0206085b09ec7 (diff)
downloadbrew-1aabba7b9e5ec9d3c3e1e5021236d4d006c97915.tar.bz2
Show conflicting files on install if linking fails
Closes Homebrew/homebrew#18303. Closes Homebrew/homebrew#20726.
Diffstat (limited to 'Library')
-rw-r--r--Library/Homebrew/formula_installer.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index 06b965e64..44e57c730 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -364,6 +364,10 @@ class FormulaInstaller
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 `brew link #{f.name}'"
+ puts
+ puts "Possible conflicting files are:"
+ mode = OpenStruct.new(:dry_run => true, :overwrite => true)
+ keg.link(mode)
ohai e, e.backtrace if ARGV.debug?
@show_summary_heading = true
ignore_interrupts{ keg.unlink }