summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-11-14 20:44:17 -0800
committerAndre Arko <andre@arko.net>2012-11-14 20:44:17 -0800
commitf99bc89baa20c26b84d7e4d146968451afd78b95 (patch)
tree8e34c2e2f4977fd806aefdc1923a09532c84d94a
parent7268495a5a4708519fcfcfbe48940096672ea6a0 (diff)
downloadbundler-f99bc89baa20c26b84d7e4d146968451afd78b95.tar.gz
you can have Psych without Psych::SyntaxError :\
-rw-r--r--lib/bundler/psyched_yaml.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/bundler/psyched_yaml.rb b/lib/bundler/psyched_yaml.rb
index fe1a701684..70bd4b7f71 100644
--- a/lib/bundler/psyched_yaml.rb
+++ b/lib/bundler/psyched_yaml.rb
@@ -16,5 +16,9 @@ module Bundler
# On encountering invalid YAML,
# Psych raises Psych::SyntaxError
# Syck raises ArgumentError
- YamlSyntaxError = defined?(Psych) ? Psych::SyntaxError : ArgumentError
+ if defined?(::Psych::SyntaxError)
+ YamlSyntaxError = ::Psych::SyntaxError
+ else
+ YamlSyntaxError = ::ArgumentError
+ end
end