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

Revert d231b8f95b35d8a344cec4f62d7bbdf360a70e1c and add debug print

Browse Source
This commit is contained in:
Kazuhiro NISHIYAMA 2020-06-22 18:15:21 +09:00
parent 78352fb52e
commit 7ac6c967e4
No known key found for this signature in database
GPG Key ID: 262ED8DBB4222F7A
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fileutils.rb
View File

@ -1287,11 +1287,7 @@ module FileUtils
def entries def entries
opts = {} opts = {}
if fu_windows? && ::Encoding.compatible?(::Encoding::UTF_8, path.encoding) opts[:encoding] = fu_windows? ? ::Encoding::UTF_8 : path.encoding
opts[:encoding] = ::Encoding::UTF_8
else
opts[:encoding] = path.encoding
end
files = if Dir.respond_to?(:children) files = if Dir.respond_to?(:children)
Dir.children(path, **opts) Dir.children(path, **opts)

5
test/fileutils/test_fileutils.rb
View File

@ -770,7 +770,10 @@ class TestFileUtils < Test::Unit::TestCase
File.write("#{dir}/#{c}.txt", "test_remove_entry_multibyte_path") File.write("#{dir}/#{c}.txt", "test_remove_entry_multibyte_path")
remove_entry dir remove_entry dir
assert_file_not_exist dir assert_no_file_exist dir
rescue MiniTest::Assertion
STDERR.puts Dir.glob("#{dir}/**").inspect
raise
end end
def test_remove_entry_secure def test_remove_entry_secure