summaryrefslogtreecommitdiff
path: root/lib/pathname.rb
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-15 05:50:45 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-15 05:50:45 +0000
commiteebb06165f56fc316b03fbd6734a513eb05a96ac (patch)
tree1a06d2a290a4b673be05b916b6f67ad7a37f191b /lib/pathname.rb
parentc23d3e4640e52104bc513136e37a58223bf3da09 (diff)
* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
was failed. [ruby-core:4992] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/pathname.rb')
-rw-r--r--lib/pathname.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pathname.rb b/lib/pathname.rb
index be1cb29b43..83f517d49e 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -868,10 +868,10 @@ class Pathname # * mixed *
# Removes a file or directory, using <tt>File.unlink</tt> or
# <tt>Dir.unlink</tt> as necessary.
def unlink()
- if FileTest.directory? @path
- Dir.unlink @path
- else
+ begin
File.unlink @path
+ rescue Errno::EISDIR
+ Dir.unlink @path
end
end
alias delete unlink