summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-15 15:32:35 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-15 15:32:35 +0000
commitcb025decffb74f95cadddf4ea278d8ad7b7eddf9 (patch)
tree3c7bfdefff650af3983117e560b46f1348b8b5ba
parentcd836a0cd2b952dc6d44bbfeec7d9ee1bc98f313 (diff)
* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
Errno::EISDIR because EISDIR is not portable. [ruby-core:5001] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8464 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/pathname.rb2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f6658c0d02..7fc2b422c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon May 16 00:21:02 2005 Tanaka Akira <akr@m17n.org>
+
+ * lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
+ Errno::EISDIR because EISDIR is not portable.
+ [ruby-core:5001]
+
Sun May 15 22:28:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
diff --git a/lib/pathname.rb b/lib/pathname.rb
index 83f517d49e..99261ca9d9 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -870,7 +870,7 @@ class Pathname # * mixed *
def unlink()
begin
File.unlink @path
- rescue Errno::EISDIR
+ rescue SystemCallError
Dir.unlink @path
end
end