diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index c826598e884d67578bd5f8cbedec66a2142036c9..0a7d9ae2c974db7561687f05b247fd6c447c1b6b 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -325,12 +325,14 @@ class Keg private def resolve_any_conflicts dst, mode + return unless dst.symlink? + src = dst.resolved_path # src itself may be a symlink, so check lstat to ensure we are dealing with # a directory, and not a symlink pointing at a directory (which needs to be # treated as a file). In other words, we only want to resolve one symlink. # If it isn't a directory, make_relative_symlink will raise an exception. - if dst.symlink? && src.lstat.directory? + if src.lstat.directory? keg = Keg.for(src) dst.unlink unless mode.dry_run keg.link_dir(src, mode) { :mkpath }