kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to

Browse source 
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/trunk@45720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2014-04-25 14:28:56 +00:00
parent 2f60d08519
commit 1377f38c9b
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Fri Apr 25 22:54:34 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]
Fri Apr 25 19:16:30 2014 Tanaka Akira <akr@fsij.org>
* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.

2
lib/fileutils.rb
View file

@ -277,7 +277,7 @@ module FileUtils
Dir.rmdir(dir)
end
end
rescue Errno::ENOTEMPTY, Errno::ENOENT
rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
end
end
end