diff options
| author | Andre Arko <andre@arko.net> | 2011-09-17 18:55:42 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-17 18:55:43 -0700 |
| commit | 73b04ed902aa0265f70ea8fc54b018de554674e0 (patch) | |
| tree | a4c2ca476172b551521e93c1ea03fd615cb22b6f | |
| parent | 2eb123ab46877354d8a86e6bba6537568c768e4f (diff) | |
| download | bundler-73b04ed902aa0265f70ea8fc54b018de554674e0.tar.gz | |
Don't require Psych if Syck is loaded
fixes #1239
| -rw-r--r-- | lib/bundler.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb index ba1cd5573a..eb1ae751e4 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -3,7 +3,8 @@ require 'fileutils' require 'pathname' begin - require 'psych' + # Pull in Psych if we can, but not if Syck is already loaded + require 'psych' unless defined?(YAML) rescue LoadError end |