Revert "FileUtils.rm* methods swallows only Errno::ENOENT when force is true"

lib/fileutils.rb

@@ -1165,7 +1165,7 @@ def mv(src, dest, force: nil, noop: nil, verbose: nil, secure: nil)
   #
   # Keyword arguments:
   #
-  # - <tt>force: true</tt> - ignores raised exceptions of Errno::ENOENT
+  # - <tt>force: true</tt> - ignores raised exceptions of StandardError
   #   and its descendants.
   # - <tt>noop: true</tt> - does not remove files; returns +nil+.
   # - <tt>verbose: true</tt> - prints an equivalent command:
@@ -1248,7 +1248,7 @@ def rm_f(list, noop: nil, verbose: nil)
   #
   # Keyword arguments:
   #
-  # - <tt>force: true</tt> - ignores raised exceptions of Errno::ENOENT
+  # - <tt>force: true</tt> - ignores raised exceptions of StandardError
   #   and its descendants.
   # - <tt>noop: true</tt> - does not remove entries; returns +nil+.
   # - <tt>secure: true</tt> - removes +src+ securely;
@@ -1315,7 +1315,7 @@ def rm_rf(list, noop: nil, verbose: nil, secure: nil)
   # see {Avoiding the TOCTTOU Vulnerability}[rdoc-ref:FileUtils@Avoiding+the+TOCTTOU+Vulnerability].
   #
   # Optional argument +force+ specifies whether to ignore
-  # raised exceptions of Errno::ENOENT and its descendants.
+  # raised exceptions of StandardError and its descendants.
   #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
@@ -1384,12 +1384,10 @@ def remove_entry_secure(path, force = false)
         ent.remove
       rescue
         raise unless force
-        raise unless Errno::ENOENT === $!
       end
     end
   rescue
     raise unless force
-    raise unless Errno::ENOENT === $!
   end
   module_function :remove_entry_secure
 
@@ -1415,7 +1413,7 @@ def fu_stat_identical_entry?(a, b)   #:nodoc:
   # should be {interpretable as a path}[rdoc-ref:FileUtils@Path+Arguments].
   #
   # Optional argument +force+ specifies whether to ignore
-  # raised exceptions of Errno::ENOENT and its descendants.
+  # raised exceptions of StandardError and its descendants.
   #
   # Related: FileUtils.remove_entry_secure.
   #
@@ -1425,12 +1423,10 @@ def remove_entry(path, force = false)
         ent.remove
       rescue
         raise unless force
-        raise unless Errno::ENOENT === $!
       end
     end
   rescue
     raise unless force
-    raise unless Errno::ENOENT === $!
   end
   module_function :remove_entry
 
@@ -1441,15 +1437,14 @@ def remove_entry(path, force = false)
   # should be {interpretable as a path}[rdoc-ref:FileUtils@Path+Arguments].
   #
   # Optional argument +force+ specifies whether to ignore
-  # raised exceptions of Errno::ENOENT and its descendants.
+  # raised exceptions of StandardError and its descendants.
   #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #
   def remove_file(path, force = false)
     Entry_.new(path).remove_file
   rescue
     raise unless force
-    raise unless Errno::ENOENT === $!
   end
   module_function :remove_file
 
@@ -1461,7 +1456,7 @@ def remove_file(path, force = false)
   # should be {interpretable as a path}[rdoc-ref:FileUtils@Path+Arguments].
   #
   # Optional argument +force+ specifies whether to ignore
-  # raised exceptions of Errno::ENOENT and its descendants.
+  # raised exceptions of StandardError and its descendants.
   #
   # Related: {methods for deleting}[rdoc-ref:FileUtils@Deleting].
   #

test/fileutils/test_fileutils.rb

@@ -1822,26 +1822,6 @@ def test_rm_rf
     assert_file_not_exist 'tmpdatadir'
   end
 
-  def test_rm_rf_no_permissions
-    check_singleton :rm_rf
-
-    return if /mswin|mingw/ =~ RUBY_PLATFORM
-
-    mkdir 'tmpdatadir'
-    touch 'tmpdatadir/tmpdata'
-    chmod "-x", 'tmpdatadir'
-
-    begin
-      assert_raise Errno::EACCES do
-        rm_rf 'tmpdatadir'
-      end
-
-      assert_file_exist 'tmpdatadir'
-    ensure
-      chmod "+x", 'tmpdatadir'
-    end
-  end
-
   def test_rmdir
     check_singleton :rmdir