Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge revision(s) 33254:

* lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
  open files in binary mode.
  see more details in jimweirich/rake#74


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 2349592a517c89621560462ff9a36413b21f074c 1 parent 3943252
@unak unak authored
Showing with 8 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +1 −1  lib/rake/file_list.rb
  3. +1 −1  version.h
View
6 ChangeLog
@@ -1,3 +1,9 @@
+Tue Feb 14 16:57:11 2012 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rake/file_list.rb (Rake::FileList#egrep): there is no need to
+ open files in binary mode.
+ see more details in https://github.com/jimweirich/rake/issues/74
+
Tue Feb 14 16:52:17 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/rdoc/encoding.rb (RDoc::Encoding.read_file): fixup newline chars
View
2  lib/rake/file_list.rb
@@ -286,7 +286,7 @@ def egrep(pattern, *options)
matched = 0
each do |fn|
begin
- open(fn, "rb", *options) do |inf|
+ open(fn, "r:ascii-8bit", *options) do |inf|
count = 0
inf.each do |line|
count += 1
View
2  version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 109
+#define RUBY_PATCHLEVEL 110
#define RUBY_RELEASE_DATE "2012-02-14"
#define RUBY_RELEASE_YEAR 2012
Please sign in to comment.
Something went wrong with that request. Please try again.