Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

* 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
commit 5cfba33a77d73bc09df850858ccd8ed8eb7014d4 1 parent 83f742f
Hiroshi Shirosaki authored February 20, 2012
6  ChangeLog
... ...
@@ -1,3 +1,9 @@
  1
+Mon Feb 20 21:16:48 2012  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
  2
+
  3
+	* lib/fileutils.rb: revert a line modified accidentally at r34669.
  4
+	  This fixes mingw test errors in TestDir_M17N.
  5
+	  [ruby-core:42728] [Feature #4970]
  6
+
1 7
 Mon Feb 20 21:09:27 2012  Tanaka Akira  <akr@fsij.org>
2 8
 
3 9
 	* ext/curses/curses.c (Init_curses): define Curses::VERSION.
2  lib/fileutils.rb
@@ -1342,7 +1342,7 @@ def door?
1342 1342
 
1343 1343
     def entries
1344 1344
       opts = {}
1345  
-      opts[:encoding] = "UTF-8" if /mswin|mignw/ =~ RUBY_PLATFORM
  1345
+      opts[:encoding] = ::Encoding::UTF_8 if fu_windows?
1346 1346
       Dir.entries(path(), opts)\
1347 1347
           .reject {|n| n == '.' or n == '..' }\
1348 1348
           .map {|n| Entry_.new(prefix(), join(rel(), n.untaint)) }

0 notes on commit 5cfba33

Please sign in to comment.
Something went wrong with that request. Please try again.