From 257b0e43ec207ad201a6f50ea9c63a5f0bd7f58d Mon Sep 17 00:00:00 2001
From: Jack Nagel
Date: Mon, 20 Oct 2014 17:07:53 -0500
Subject: Return early from resolve_any_conflicts for non-symlinks

---
 Library/Homebrew/keg.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Library')

diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index c826598e8..0a7d9ae2c 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 }
-- 
cgit v1.2.3