Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* 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
  • Loading branch information...
commit 5cfba33a77d73bc09df850858ccd8ed8eb7014d4 1 parent 83f742f
@shirosaki shirosaki authored
Showing with 7 additions and 1 deletion.
  1. +6 −0 ChangeLog
  2. +1 −1  lib/fileutils.rb
View
6 ChangeLog
@@ -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.
View
2  lib/fileutils.rb
@@ -1342,7 +1342,7 @@ def door?
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)) }
Please sign in to comment.
Something went wrong with that request. Please try again.