Skip to content
Snippets Groups Projects
Commit 05ba3f0e authored by Jack Nagel's avatar Jack Nagel
Browse files

Return early from resolve_any_conflicts for non-symlinks

parent 975f61d9
No related branches found
No related tags found
No related merge requests found
......@@ -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 }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment