diff options
| author | Andre Arko <andre@arko.net> | 2011-09-21 10:34:29 -0700 |
|---|---|---|
| committer | Andre Arko <andre@arko.net> | 2011-09-21 10:34:29 -0700 |
| commit | 4ef23891bf40ecf7e39bb9e5fbed2ca6c1a8bd80 (patch) | |
| tree | c9e45d378e9d60d32fb42f9395a6017c7d0125f4 | |
| parent | 9d1d7f7817acb5c263f763504f5e179359a2b2a4 (diff) | |
| download | bundler-4ef23891bf40ecf7e39bb9e5fbed2ca6c1a8bd80.tar.gz | |
we need to require yaml even if we have psych
fixes #1441
| -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 ee5c808af1..3e4a9a25f7 100644 --- a/lib/bundler.rb +++ b/lib/bundler.rb @@ -4,8 +4,9 @@ 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?(::YAML) rescue LoadError +ensure require 'yaml' end |