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

* lib/fileutils.rb: revert a line modified accidentally at r34669.

Browse source 
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
This commit is contained in:
shirosaki 2012-02-20 12:30:11 +00:00
parent 83f742f86f
commit 5cfba33a77
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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.

2
lib/fileutils.rb
View file

@ -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)) }