diff options
| author | Jack Nagel | 2014-07-02 10:47:54 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-07-02 10:48:18 -0500 |
| commit | 9230dc02f55e28393a9cbe8178c3dea7806e7447 (patch) | |
| tree | 408a71d9b2519db1c7552fdcef02b60b5a50e990 /Library | |
| parent | 775bbed024cb7f3aa09b45b7b15043bbd243e835 (diff) | |
| download | homebrew-9230dc02f55e28393a9cbe8178c3dea7806e7447.tar.bz2 | |
Pass relative paths into link exceptions
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/keg.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 5ab59a841..e80745a0b 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -37,7 +37,7 @@ class Keg def to_s s = [] - s << "Could not symlink #{src.relative_path_from(Pathname(keg))}" + s << "Could not symlink #{src}" s << "Target #{dst}" << suggestion s << <<-EOS.undent To force the link and overwrite all conflicting files: @@ -52,7 +52,7 @@ class Keg class DirectoryNotWritableError < LinkError def to_s; <<-EOS.undent - Could not symlink #{src.relative_path_from(Pathname(keg))} + Could not symlink #{src} #{dst.dirname} is not writable. EOS end @@ -362,15 +362,15 @@ class Keg dst.make_relative_symlink(src) rescue Errno::EEXIST if dst.exist? - raise ConflictError.new(self, src, dst) + raise ConflictError.new(self, src.relative_path_from(path), dst) elsif dst.symlink? dst.unlink retry end rescue Errno::EACCES - raise DirectoryNotWritableError.new(self, src, dst) + raise DirectoryNotWritableError.new(self, src.relative_path_from(path), dst) rescue SystemCallError - raise LinkError.new(self, src, dst) + raise LinkError.new(self, src.relative_path_from(path), dst) end protected |
