From 2635984cf2b9b7632f8b35afa2f29d219aba104a Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 16 Sep 2017 11:59:47 +0000 Subject: fileutils.rb: error at rmdir * 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 --- lib/fileutils.rb | 8 ++++---- test/fileutils/test_fileutils.rb | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/fileutils.rb b/lib/fileutils.rb index ad4a21e26e..37945b4096 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -245,15 +245,15 @@ module FileUtils fu_output_message "rmdir #{parents ? '-p ' : ''}#{list.join ' '}" if verbose return if noop list.each do |dir| - begin - Dir.rmdir(dir = remove_trailing_slash(dir)) - if parents + Dir.rmdir(dir = remove_trailing_slash(dir)) + if parents + begin until (parent = File.dirname(dir)) == '.' or parent == dir dir = parent Dir.rmdir(dir) end + rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT end - rescue Errno::ENOTEMPTY, Errno::EEXIST, Errno::ENOENT end end end diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb index 923468d2b9..0c79bc4c1f 100644 --- a/test/fileutils/test_fileutils.rb +++ b/test/fileutils/test_fileutils.rb @@ -1612,6 +1612,15 @@ class TestFileUtils < Test::Unit::TestCase subdir = 'data/sub/dir' 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) { rmdir(subdir, parents: true) } -- cgit v1.2.3