aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend
diff options
context:
space:
mode:
authorJack Nagel2014-03-27 09:35:10 -0500
committerJack Nagel2014-03-27 09:35:10 -0500
commite9ee6400242b6137a627f803897e50b403ea976d (patch)
tree149b30cc41b76a8abd805c0166fcb9aad94cb7df /Library/Homebrew/extend
parentf6b5c83482b9ebbd390831f41767f9dd9b33162f (diff)
downloadbrew-e9ee6400242b6137a627f803897e50b403ea976d.tar.bz2
Don't let broken symlinks halt linking
Diffstat (limited to 'Library/Homebrew/extend')
-rw-r--r--Library/Homebrew/extend/pathname.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 1ec35b9cd..dd95cc789 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -298,7 +298,7 @@ class Pathname
# NOTE only system ln -s will create RELATIVE symlinks
quiet_system 'ln', '-s', src.relative_path_from(self.dirname), self.basename
if not $?.success?
- if symlink? && exist? || symlink?
+ if symlink? && exist?
raise <<-EOS.undent
Could not symlink file: #{src.expand_path}
Target #{self} already exists as a symlink to #{readlink}.
@@ -320,6 +320,9 @@ class Pathname
To list all files that would be deleted:
brew link --overwrite --dry-run formula_name
EOS
+ elsif symlink?
+ unlink
+ make_relative_symlink(src)
elsif !dirname.writable_real?
raise <<-EOS.undent
Could not symlink file: #{src.expand_path}