diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:23:49 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-08-31 07:23:49 +0000 |
commit | 7eb57e5a6c35ee75ae7b952e0e69df5db5a80dbf (patch) | |
tree | 6d2c7ca8d75beedd4800a747bc5b55f07c9e0a1b | |
parent | 96fac49c19cef2dedf835cd00eb57ad523fd5e1f (diff) |
merge revision(s) 45720: [Backport #9571]
* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
directory is not an empty directory, rmdir() shall fail and set
errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
[Bug #9571] [ruby-dev:48017]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@47336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/fileutils.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Sun Aug 31 16:23:41 2014 Naohisa Goto <ngotogenome@gmail.com> + + * lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to + ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the + directory is not an empty directory, rmdir() shall fail and set + errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST. + [Bug #9571] [ruby-dev:48017] + Sun Aug 31 16:20:14 2014 Tanaka Akira <akr@fsij.org> * lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which diff --git a/lib/fileutils.rb b/lib/fileutils.rb index cb89bb3444..13a4d152d0 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -271,7 +271,7 @@ module FileUtils Dir.rmdir(dir) end end - rescue Errno::ENOTEMPTY, Errno::ENOENT + rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT end end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-08-31" -#define RUBY_PATCHLEVEL 536 +#define RUBY_PATCHLEVEL 537 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 8 |