mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
d650009151
commit
11ab6f8cd5
2 changed files with 2 additions and 2 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue