diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-15 05:50:45 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-15 05:50:45 +0000 |
| commit | 671dc89d727365fa5926ffb0de31a5b51356a616 (patch) | |
| tree | 1a06d2a290a4b673be05b916b6f67ad7a37f191b | |
| parent | 00be1c385b77c1fbde45d8f26dc036f53e0c3f67 (diff) | |
| download | ruby-671dc89d727365fa5926ffb0de31a5b51356a616.tar.gz ruby-671dc89d727365fa5926ffb0de31a5b51356a616.tar.xz ruby-671dc89d727365fa5926ffb0de31a5b51356a616.zip | |
* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
was failed. [ruby-core:4992]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/pathname.rb | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sun May 15 14:35:46 2005 Tanaka Akira <akr@m17n.org> + + * lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory + was failed. [ruby-core:4992] + Sun May 15 09:57:30 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/win32.c (unixtime_to_filetime): deal with DST. diff --git a/lib/pathname.rb b/lib/pathname.rb index be1cb29b4..83f517d49 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 |