From adb15b7da34dcff6a9b4ccfe399ac330db161bbe Mon Sep 17 00:00:00 2001
From: Adam Daniels <adam@mediadrive.ca>
Date: Fri, 19 Apr 2024 12:47:09 -0400
Subject: [PATCH] Don't warn about missing dependency if error was a version
 conflict

The error triggered when loading psych may not be due to a missing
library but an already activated version of psych which is now
conflicting.

Hide the missing dependency warning to prevent any sort of confusion.
---
 lib/yaml.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/yaml.rb b/lib/yaml.rb
index b266989..5c22698 100644
--- a/lib/yaml.rb
+++ b/lib/yaml.rb
@@ -2,7 +2,12 @@
 
 begin
   require 'psych'
-rescue LoadError
+rescue LoadError => ex
+  # Skip warning message concerning missing yaml dependency as LoadError wasn't
+  # triggered due to a missing dependency but because of a conflicting version
+  # which was already activated.
+  raise if ex.message.match?(/already activated/)
+
   case RUBY_ENGINE
   when 'jruby'
     warn "The Psych YAML extension failed to load.\n" \