merge revision(s) 48854: [Backport #10494]

	* test/lib/test/unit.rb: Also rescue EINVAL for older Linux that
  raises it in popen. [Bug #10494]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 2 insertions, 2 deletions

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index b96dece837..23c1be8f92 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -388,7 +388,7 @@ module Test
           begin
             require 'io/console'
             width = $stdout.winsize[1]
-          rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF
+          rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF, Errno::EINVAL
             width = ENV["COLUMNS"].to_i.nonzero? || 80
           end
           width -= 1 if /mswin|mingw/ =~ RUBY_PLATFORM
diff --git a/version.h b/version.h
index 3b636afa1b..4986fc8a99 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2015-01-30"
-#define RUBY_PATCHLEVEL 626
+#define RUBY_PATCHLEVEL 627
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1