From 7312ba0819fa0f0fc4df76a314b5eb42d3789dc0 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Jul 2005 15:17:35 +0000
Subject: * lib/pathname.rb (Pathname#unlink): try Dir.unlink first to   avoid
 unlink a directory by root.   cf. [ruby-dev:26237]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 6 ++++++
 lib/pathname.rb | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 52e9bc9c9..87490a409 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
+
+	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
+	  avoid unlink a directory by root.
+	  cf. [ruby-dev:26237]
+
 Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/debug.rb (debug_command): added a deficient format specifier.
diff --git a/lib/pathname.rb b/lib/pathname.rb
index b7cc01edb..b21abd746 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -861,9 +861,9 @@ class Pathname    # * mixed *
   # <tt>Dir.unlink</tt> as necessary.
   def unlink()
     begin
-      File.unlink @path
-    rescue SystemCallError
       Dir.unlink @path
+    rescue Errno::ENOTDIR
+      File.unlink @path
     end
   end
   alias delete unlink
-- 
cgit