mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
lib/rubygems/indexer.rb: suppress random test-all error
by bundler. Similar to r65613, but fixing this more carefully because here is not just inside tests but inside rubygems code. http://ci.rvm.jp/results/trunk_gcc5@silicon-docker/1448239 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65629 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8634e62a62
commit
c68d1c924c
1 changed files with 8 additions and 1 deletions
|
@ -4,10 +4,17 @@ require 'rubygems/package'
|
||||||
require 'time'
|
require 'time'
|
||||||
require 'tmpdir'
|
require 'tmpdir'
|
||||||
|
|
||||||
|
rescue_exceptions = [LoadError]
|
||||||
|
begin
|
||||||
|
require 'bundler/errors'
|
||||||
|
rescue LoadError # this rubygems + old ruby
|
||||||
|
else # this rubygems + ruby trunk with bundler
|
||||||
|
rescue_exceptions << Bundler::GemfileNotFound
|
||||||
|
end
|
||||||
begin
|
begin
|
||||||
gem 'builder'
|
gem 'builder'
|
||||||
require 'builder/xchar'
|
require 'builder/xchar'
|
||||||
rescue LoadError
|
rescue *rescue_exceptions
|
||||||
end
|
end
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|
Loading…
Reference in a new issue