summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/rake/file_list.rb2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3454586ab0..955f3ce49b 100644
--- a/ChangeLog
+++ b/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
diff --git a/lib/rake/file_list.rb b/lib/rake/file_list.rb
index 9f780346f3..e49ccd0147 100644
--- a/lib/rake/file_list.rb
+++ b/lib/rake/file_list.rb
@@ -286,7 +286,7 @@ module Rake
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
diff --git a/version.h b/version.h
index 018fe17c21..7017361e78 100644
--- a/version.h
+++ b/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