diff options
| author | wycats <wycats@gmail.com> | 2010-07-25 17:20:32 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-07-25 17:20:32 -0700 |
| commit | 46b167d475e61d67b77247b3147b69edb500bed5 (patch) | |
| tree | afc535e8a96df5e065a7f84794d1a947eb8d1afe | |
| parent | a2351fe630a76c138680d30f1f81505d134a7b1f (diff) | |
| parent | a158183a29e1dc80fed329a5822b9f6431b75dff (diff) | |
| download | bundler-46b167d475e61d67b77247b3147b69edb500bed5.tar.gz | |
Merge remote branch 'tenderlove/psych'
| -rw-r--r-- | lib/bundler/source.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 4f61ae3b1a..db28bbdd7f 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -329,7 +329,7 @@ module Bundler begin Gem::Specification.from_yaml(file.basename) # Raises ArgumentError if the file is not valid YAML - rescue ArgumentError, Gem::EndOfYAMLException, Gem::Exception + rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception begin eval(File.read(file.basename), TOPLEVEL_BINDING, file.expand_path.to_s) rescue LoadError |