Avoid RubyGems psych warning breaking the testsseg-rubygems-psych-warning

2 files changed, 12 insertions, 1 deletions

diff --git a/lib/bundler/deprecate.rb b/lib/bundler/deprecate.rb
index b3a9823925..23b80b8726 100644
--- a/lib/bundler/deprecate.rb
+++ b/lib/bundler/deprecate.rb
@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module Bundler
-  if defined? ::Deprecate
+  if defined? Bundler::Deprecate
+    # nothing to do!
+  elsif defined? ::Deprecate
     Deprecate = ::Deprecate
   elsif defined? Gem::Deprecate
     Deprecate = Gem::Deprecate
diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
index aeb2b30310..e654416a5a 100644
--- a/lib/bundler/psyched_yaml.rb
+++ b/lib/bundler/psyched_yaml.rb
@@ -26,3 +26,12 @@ module Bundler
     YamlLibrarySyntaxError = ::ArgumentError
   end
 end
+
+require "bundler/deprecate"
+begin
+  Bundler::Deprecate.skip_during do
+    require "rubygems/safe_yaml"
+  end
+rescue LoadError
+  # it's OK if the file isn't there
+end