[rubygems/rubygems] Reword the message

For errors that could happened while loading `rubygems/defaults/operating_system` rubygems/rubygems@6e1e2141f8
ruby · Aug 31, 2021 · 34e073c · 34e073c
1 parent 7d85948
commit 34e073c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
@@ -1333,7 +1333,12 @@ def default_gem_load_paths
 rescue LoadError
   # Ignored
 rescue Exception => e
-  raise e.class, "#{e.message}\nThis is not expected so please report this issue to your OS support and ask for help."
+  msg = "#{e.message}\n" \
+    "Loading the rubygems/defaults/operating_system.rb file caused an error. " \
+    "This file is owned by your OS, not by rubygems upstream. " \
+    "Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \
+    "the problem and ask for help."
+  raise e.class, msg
 end
 
 begin

diff --git a/test/rubygems/test_rubygems.rb b/test/rubygems/test_rubygems.rb
@@ -15,7 +15,11 @@ def test_operating_system_other_exceptions
 
     output = Gem::Util.popen(*ruby_with_rubygems_and_fake_operating_system_in_load_path(path), '-e', "'require \"rubygems\"'", {:err => [:child, :out]}).strip
     assert !$?.success?
-    assert_includes output, "This is not expected so please report this issue to your OS support and ask for help"
+    assert_includes output, "unterminated string meets end of file (SyntaxError)"
+    assert_includes output, "Loading the rubygems/defaults/operating_system.rb file caused an error. " \
+    "This file is owned by your OS, not by rubygems upstream. " \
+    "Please find out which OS package this file belongs to and follow the guidelines from your OS to report " \
+    "the problem and ask for help."
   end
 
   private