diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2016-07-15 13:36:31 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2016-07-19 17:13:45 -0500 |
commit | e7b4b41cd026883816a6fdb431a9b2cb91f59c09 (patch) | |
tree | b009039efa99bc1f332f6e4c8ee3708d4715d2ff /lib/bundler/settings.rb | |
parent | 752ad8a4c10d6f43eecbfdf8b6a3c7f692ab9692 (diff) | |
download | bundler-e7b4b41cd026883816a6fdb431a9b2cb91f59c09.tar.gz |
Mild 1.8.7 $SAFE=1 compatibility
Diffstat (limited to 'lib/bundler/settings.rb')
-rw-r--r-- | lib/bundler/settings.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb index ff0b1460..67ae20ff 100644 --- a/lib/bundler/settings.rb +++ b/lib/bundler/settings.rb @@ -276,11 +276,12 @@ module Bundler }xo def load_config(config_file) - SharedHelpers.filesystem_access(config_file, :read) do - valid_file = config_file && config_file.exist? && !config_file.size.zero? + return unless config_file + SharedHelpers.filesystem_access(config_file, :read) do |file| + valid_file = file.exist? && !file.size.zero? return {} if ignore_config? || !valid_file require "bundler/yaml_serializer" - YAMLSerializer.load config_file.read + YAMLSerializer.load file.read end end |