diff options
| author | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-20 12:30:11 +0000 |
|---|---|---|
| committer | shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-20 12:30:11 +0000 |
| commit | 5cfba33a77d73bc09df850858ccd8ed8eb7014d4 (patch) | |
| tree | 2e94bcb2ba66303fd322e205f8d84a3d80b9cf6f | |
| parent | 83f742f86fd20527b5568dca7bdf2b251c511f55 (diff) | |
* lib/fileutils.rb: revert a line modified accidentally at r34669.
This fixes mingw test errors in TestDir_M17N.
[ruby-core:42728] [Feature #4970]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/fileutils.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Feb 20 21:16:48 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> + + * lib/fileutils.rb: revert a line modified accidentally at r34669. + This fixes mingw test errors in TestDir_M17N. + [ruby-core:42728] [Feature #4970] + Mon Feb 20 21:09:27 2012 Tanaka Akira <akr@fsij.org> * ext/curses/curses.c (Init_curses): define Curses::VERSION. diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 8d1009bda3..46dfffb650 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1342,7 +1342,7 @@ private def entries opts = {} - opts[:encoding] = "UTF-8" if /mswin|mignw/ =~ RUBY_PLATFORM + opts[:encoding] = ::Encoding::UTF_8 if fu_windows? Dir.entries(path(), opts)\ .reject {|n| n == '.' or n == '..' }\ .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) } |