From 9d1d7f7817acb5c263f763504f5e179359a2b2a4 Mon Sep 17 00:00:00 2001 From: Andre Arko Date: Mon, 19 Sep 2011 00:00:16 -0700 Subject: looks like yaml is needed if psych fails --- lib/bundler.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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' -- cgit v1.2.1