diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-25 18:35:16 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-01-25 18:35:16 +0000 |
| commit | 11611c1b002243a766c86c374b812c61a5b672c7 (patch) | |
| tree | c7d9b38bc4df39e6f5d4ce3080acade92aed8b2d /activesupport/lib | |
| parent | be80d460f7389d3b5db7248cc4fb726fa61db4e4 (diff) | |
| download | rails-11611c1b002243a766c86c374b812c61a5b672c7.tar.gz rails-11611c1b002243a766c86c374b812c61a5b672c7.tar.bz2 rails-11611c1b002243a766c86c374b812c61a5b672c7.zip | |
Raise LoadErrors separately
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/dependencies.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/dependencies.rb b/activesupport/lib/dependencies.rb index e5e806b65a..7f53998e7a 100644 --- a/activesupport/lib/dependencies.rb +++ b/activesupport/lib/dependencies.rb @@ -18,8 +18,10 @@ module Dependencies loaded << file_name begin require_or_load(file_name) + rescue LoadError + raise unless swallow_load_errors rescue Object => e - raise ScriptError, "#{e.message}" unless e.is_a?(LoadError) && swallow_load_errors + raise ScriptError, "#{e.message}" end end end |