summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-26 12:36:45 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-26 12:36:45 +0000
commitaf6adb9982b93d3e960bc6fe6fa37d01b8f9f130 (patch)
treeff819bcd75062ce66fb03b9e5dcb8f161761f47c /lib
parenta2456daf94d2a40d03fc76e4e165d885f4556e0e (diff)
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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/rubygems/indexer.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/rubygems/indexer.rb b/lib/rubygems/indexer.rb
index 8e59997dba..b97347177d 100644
--- a/lib/rubygems/indexer.rb
+++ b/lib/rubygems/indexer.rb
@@ -4,10 +4,17 @@ require 'rubygems/package'
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
##