Handle conflicts where links point at symlinks

Fixes #30664.

1 files changed, 6 insertions, 5 deletions

diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb
index 45aab7eb4..9b9625fbc 100644
--- a/Library/Homebrew/keg.rb
+++ b/Library/Homebrew/keg.rb
@@ -322,11 +322,12 @@ class Keg
   private
 
   def resolve_any_conflicts dst, mode
-    # if it isn't a directory then a severe conflict is about to happen. Let
-    # it, and the exception that is generated will message to the user about
-    # the situation
-    if dst.symlink? and dst.directory?
-      src = dst.resolved_path
+    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 onlly want to resolve one symlink.
+    # If it isn't a directory, make_relative_symlink will raise an exception.
+    if dst.symlink? && src.lstat.directory?
       keg = Keg.for(src)
       dst.unlink unless mode.dry_run
       keg.link_dir(src, mode) { :mkpath }