guarantee Bundler.settings will only parse once

1 files changed, 4 insertions, 5 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 1eaf194b8f..69287a3ebf 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -210,11 +210,10 @@ module Bundler
     end
 
     def settings
-      @settings ||= begin
-        Settings.new(app_config_path)
-      rescue GemfileNotFound
-        Settings.new
-      end
+      return @settings if defined?(@settings)
+      @settings = Settings.new(app_config_path)
+    rescue GemfileNotFound
+      @settings = Settings.new
     end
 
     def with_original_env