diff options
| author | Andre Arko <andre@arko.net> | 2011-09-29 22:38:42 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-29 22:40:02 -0700 |
| commit | 517ae01e20789288a9b6db98042692946ce90cee (patch) | |
| tree | 1ee3d93aa7d3b68ad0cdac341eefab7a8a1a0bfe | |
| parent | 67834365a346dc309b2341e22c4770400bf4e6cd (diff) | |
| download | bundler-517ae01e20789288a9b6db98042692946ce90cee.tar.gz | |
MRI 1.9.2 defines YAML when Syck isn't loaded yet
| -rw-r--r-- | lib/bundler.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index 3e4a9a25f7..66f5256e0f 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -4,12 +4,11 @@ require 'pathname' begin # Pull in Psych if we can, but not if Syck is already loaded - require 'psych' unless defined?(::YAML) + require 'psych' unless defined?(Syck) rescue LoadError -ensure - require 'yaml' end +require 'yaml' require 'bundler/rubygems_ext' require 'bundler/rubygems_integration' require 'bundler/version' |