[前][次][番号順一覧][スレッド一覧]

ruby-changes:53774

From: k0kubun <ko1@a...>
Date: Mon, 26 Nov 2018 21:36:52 +0900 (JST)
Subject: [ruby-changes:53774] k0kubun:r65992 (trunk): lib/rubygems/indexer.rb: suppress random test-all error

k0kubun	2018-11-26 21:36:45 +0900 (Mon, 26 Nov 2018)

  New Revision: 65992

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

  Log:
    lib/rubygems/indexer.rb: suppress random test-all error
    
    by Bundler integration, like:
    http://ci.rvm.jp/results/trunk-no-mjit@silicon-docker/1479769
    
    This resurrects r65629 which was accidentally reverted by r65904.

  Modified files:
    trunk/lib/rubygems/indexer.rb
Index: lib/rubygems/indexer.rb
===================================================================
--- lib/rubygems/indexer.rb	(revision 65991)
+++ lib/rubygems/indexer.rb	(revision 65992)
@@ -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/

[前][次][番号順一覧][スレッド一覧]