summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2011-09-19 00:00:16 -0700
committerAndre Arko <andre@arko.net>2011-09-19 00:00:16 -0700
commit9d1d7f7817acb5c263f763504f5e179359a2b2a4 (patch)
tree1919df32667f3e08294193ef37bf6ff84339f881
parentd9d74df9b1b0e0200c8460ab10cc81f2387e252a (diff)
downloadbundler-9d1d7f7817acb5c263f763504f5e179359a2b2a4.tar.gz
looks like yaml is needed if psych failsv1.0.20.rc
-rw-r--r--lib/bundler.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index eb1ae751e4..ee5c808af1 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -6,9 +6,9 @@ begin
# Pull in Psych if we can, but not if Syck is already loaded
require 'psych' unless defined?(YAML)
rescue LoadError
+ require 'yaml'
end
-require 'yaml'
require 'bundler/rubygems_ext'
require 'bundler/rubygems_integration'
require 'bundler/version'