nagachika	2015-03-10 02:28:14 +0900 (Tue, 10 Mar 2015)

  New Revision: 49910

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49910

  Log:
    merge revision(s) r48854: [Backport #10494]
    
    * test/lib/test/unit.rb: Also rescue EINVAL for older Linux that
      raises it in popen. [Bug #10494]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/lib/test/unit.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/lib/test/unit.rb
===================================================================
--- ruby_2_1/lib/test/unit.rb	(revision 49909)
+++ ruby_2_1/lib/test/unit.rb	(revision 49910)
@@ -394,7 +394,7 @@ module Test https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/test/unit.rb#L394
           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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49909)
+++ ruby_2_1/version.h	(revision 49910)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-03-09"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_RELEASE_DATE "2015-03-10"
+#define RUBY_PATCHLEVEL 310
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48854


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/