[rubygems/rubygems] Skip to load vendored libraries if it's already l…

…oaded rubygems/rubygems@3f5093fac9
ruby · Feb 26, 2024 · 81dded1 · 81dded1
1 parent c342726
commit 81dded1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/rubygems/vendored_net_http.rb b/lib/rubygems/vendored_net_http.rb
@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "vendor/net-http/lib/net/http"
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/net/http.rb
+# We should avoid to load it again
+require_relative "vendor/net-http/lib/net/http" unless defined?(Gem::Net::HTTP)
diff --git a/lib/rubygems/vendored_timeout.rb b/lib/rubygems/vendored_timeout.rb
@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "vendor/timeout/lib/timeout"
+# Ruby 3.3 and RubyGems 3.5 is already load Gem::Timeout from lib/rubygems/timeout.rb
+# We should avoid to load it again
+require_relative "vendor/timeout/lib/timeout" unless defined?(Gem::Timeout)