diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rubygems/indexer.rb | 9 |
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 ## |