diff options
| author | Andre Arko <andre@arko.net> | 2012-11-15 17:22:57 -0800 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2012-11-15 17:22:57 -0800 |
| commit | 42e5af3d237108dbbad0720237660974c4fd784e (patch) | |
| tree | f941b84fc950b9de3cd7c2392c273a0875559ab3 /lib/bundler.rb | |
| parent | c9042b20c1dab6fa950af12cdc56151b66d4c4b4 (diff) | |
| parent | 8d6f35a3c6316fc58877b0f37e85a4be3a432736 (diff) | |
| download | bundler-42e5af3d237108dbbad0720237660974c4fd784e.tar.gz | |
Merge tag 'v1.2.2'
Version 1.2.2
Conflicts:
.travis.yml
lib/bundler.rb
lib/bundler/psyched_yaml.rb
lib/bundler/version.rb
spec/bundler/psyched_yaml_spec.rb
spec/other/clean_spec.rb
Diffstat (limited to 'lib/bundler.rb')
| -rw-r--r-- | lib/bundler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 6f33e3274c..0360d5cc9a 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -295,7 +295,7 @@ module Bundler Gem::Specification.from_yaml(contents) # Raises ArgumentError if the file is not valid YAML (on syck) # Psych raises a Psych::SyntaxError - rescue ArgumentError, YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception + rescue YamlSyntaxError, Gem::EndOfYAMLException, Gem::Exception eval_gemspec(path, contents) end else |