Revert "require_dependency should require using the normal mechanism if possible to avoid double-requires"
This was causing double requires since 991cd59a225b90ab1ba3 was reverted. This reverts commit 8bf79739b4219eb1d6464e6eb4853e92e81d7621.
This commit is contained in:
parent
fff917e37d
commit
e86cced311
@ -276,22 +276,14 @@ def load?
|
||||
end
|
||||
|
||||
def depend_on(file_name, swallow_load_errors = false, message = "No such file to load -- %s.rb")
|
||||
#path = search_for_file(file_name)
|
||||
require_or_load(file_name)
|
||||
rescue LoadError
|
||||
begin
|
||||
if path = search_for_file(file_name)
|
||||
require_or_load(path)
|
||||
else
|
||||
raise
|
||||
end
|
||||
rescue LoadError => load_error
|
||||
unless swallow_load_errors
|
||||
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
|
||||
raise LoadError.new(message % file_name).copy_blame!(load_error)
|
||||
end
|
||||
raise
|
||||
path = search_for_file(file_name)
|
||||
require_or_load(path || file_name)
|
||||
rescue LoadError => load_error
|
||||
unless swallow_load_errors
|
||||
if file_name = load_error.message[/ -- (.*?)(\.rb)?$/, 1]
|
||||
raise LoadError.new(message % file_name).copy_blame!(load_error)
|
||||
end
|
||||
raise
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user