summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2016-12-24 18:21:04 +0100
committerSamuel Giddins <segiddins@segiddins.me>2016-12-26 14:53:47 -0600
commit2bf41ad01c3a223d4c6808ce0ffd659643530537 (patch)
treebb18abb7a9b7cb162e136f443ef00c0f834972fc
parent9dd45bda26185200ca1afec0cf33ca6be2011044 (diff)
downloadbundler-2bf41ad01c3a223d4c6808ce0ffd659643530537.tar.gz
[Settings] Don't try to access config file when it is ignored
-rw-r--r--lib/bundler/settings.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index 149beddf52..35ad17ae43 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -303,10 +303,10 @@ module Bundler
}xo
def load_config(config_file)
- return {} unless config_file
+ return {} if !config_file || ignore_config?
SharedHelpers.filesystem_access(config_file, :read) do |file|
valid_file = file.exist? && !file.size.zero?
- return {} if ignore_config? || !valid_file
+ return {} unless valid_file
require "bundler/yaml_serializer"
YAMLSerializer.load file.read
end