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
commitbe2210bbbdccabc03c6bb6542fd1798997ced7e9 (patch)
tree177b39f44b60c770ca00b8d7f630efe9a20ba00d
parent381751042c924cf8caea4842abe38fd348dafb05 (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/branches/ruby_1_8@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 ba3820b59a..f9b5a6e21b 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:11:33 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 bac540230f..b701a06519 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -862,7 +862,7 @@ class Pathname # * mixed *
def unlink()
begin
File.unlink @path
- rescue Errno::EISDIR
+ rescue SystemCallError
Dir.unlink @path
end
end