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

[ruby/fileutils] Revert "FileUtils.rm* methods swallows only Errno::ENOENT when force is true"

This reverts commit https://github.com/ruby/fileutils/commit/fa65d676ece9.

This caused some incompatibility problems in real-world cases.
https://bugs.ruby-lang.org/issues/18784#change-98927
https://bugs.ruby-lang.org/issues/18784#change-98967

https://github.com/ruby/fileutils/commit/42983c2553
This commit is contained in:
Yusuke Endoh 2022-08-30 16:02:02 +09:00 committed by git
parent 33bc398b73
commit 72c7dba436
2 changed files with 6 additions and 31 deletions

View file

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

View file

@ -1822,26 +1822,6 @@ cd -
assert_file_not_exist 'tmpdatadir' assert_file_not_exist 'tmpdatadir'
end 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 def test_rmdir
check_singleton :rmdir check_singleton :rmdir