1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fileutils.rb: error at rmdir

Browse Source 
* lib/fileutils.rb (rmdir): should not ignore errors first, except
  for parent directories.  [ruby-dev:50236] [Bug #13889]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59934 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-09-16 11:59:47 +00:00
parent 40d117ae88
commit 2635984cf2
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fileutils.rb
View File

@ -245,15 +245,15 @@ module FileUtils
fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if verbose fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if verbose
return if noop return if noop
list.each do |dir| list.each do |dir|
begin Dir.rmdir(dir = remove_trailing_slash(dir))
Dir.rmdir(dir = remove_trailing_slash(dir)) if parents
if parents begin
until (parent = File.dirname(dir)) == '.' or parent == dir until (parent = File.dirname(dir)) == '.' or parent == dir
dir = parent dir = parent
Dir.rmdir(dir) Dir.rmdir(dir)
end end
rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
end end
rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT
end end
end end
end end

9
test/fileutils/test_fileutils.rb
View File

@ -1612,6 +1612,15 @@ class TestFileUtils < Test::Unit::TestCase
subdir = 'data/sub/dir' subdir = 'data/sub/dir'
mkdir_p(subdir) mkdir_p(subdir)
File.write("#{subdir}/file", '')
msg = "should fail to remove non-empty directory"
assert_raise(Errno::ENOTEMPTY, Errno::EEXIST, msg) {
rmdir(subdir)
}
assert_raise(Errno::ENOTEMPTY, Errno::EEXIST, msg) {
rmdir(subdir, parents: true)
}
File.unlink("#{subdir}/file")
assert_nothing_raised(Errno::ENOENT) { assert_nothing_raised(Errno::ENOENT) {
rmdir(subdir, parents: true) rmdir(subdir, parents: true)
} }