* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to

  avoid unlink a directory by root.
  cf. [ruby-dev:26237]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 52e9bc9c9f..87490a4098 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 b7cc01edb3..b21abd746b 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