diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 15:17:35 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-07-10 15:17:35 +0000 |
| commit | b5c68b60bd408a4e14cd58ac0410b0a7444610c2 (patch) | |
| tree | a4ff843f995e0d52bf763048dc8d5d8c7934246d /lib | |
| parent | caf49155c15fe108142e9665701439477c3686d7 (diff) | |
* 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pathname.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |