lib/active_support/dependencies.rb in activesupport-6.1.0.rc1 vs lib/active_support/dependencies.rb in activesupport-6.1.0.rc2
- old
+ new
@@ -373,10 +373,15 @@
def depend_on(file_name, message = "No such file to load -- %s.rb")
path = search_for_file(file_name)
require_or_load(path || file_name)
rescue LoadError => load_error
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
- load_error.message.replace(message % file_name)
+ load_error_message = if load_error.respond_to?(:original_message)
+ load_error.original_message
+ else
+ load_error.message
+ end
+ load_error_message.replace(message % file_name)
load_error.copy_blame!(load_error)
end
raise
end