k0kubun	2018-11-08 15:19:36 +0900 (Thu, 08 Nov 2018)

  New Revision: 65629

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

  Log:
    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

  Modified files:
    trunk/lib/rubygems/indexer.rb
Index: lib/rubygems/indexer.rb
===================================================================
--- lib/rubygems/indexer.rb	(revision 65628)
+++ lib/rubygems/indexer.rb	(revision 65629)
@@ -4,10 +4,17 @@ require 'rubygems/package' https://github.com/ruby/ruby/blob/trunk/lib/rubygems/indexer.rb#L4
 require 'time'
 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
   gem 'builder'
   require 'builder/xchar'
-rescue LoadError
+rescue *rescue_exceptions
 end
 
 ##

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