diff options
| -rw-r--r-- | lib/bundler.rb | 3 | ||||
| -rw-r--r-- | lib/bundler/psyched_yaml.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 626c179da1..622a95410a 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -292,8 +292,7 @@ module Bundler contents = File.read(path.basename.to_s) begin Gem::Specification.from_yaml(contents) - # Raises ArgumentError if the file is not valid YAML - rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception + rescue YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception begin eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s) rescue LoadError, SyntaxError => e diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb index 6a75eecbe1..9501d242df 100644 --- a/lib/bundler/psyched_yaml.rb +++ b/lib/bundler/psyched_yaml.rb @@ -14,6 +14,9 @@ end # Psych might NOT EXIST AT ALL require 'yaml' +# if the file is not valid YAML: +# * Syck raises ArgumentError +# * Psych raises Psych::SyntaxError begin YamlSyntaxError = Psych::SyntaxError rescue NameError |