From 2fa9f3c0322570dfb1672b49bc1f3306ef595131 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Tue, 15 Dec 2020 08:32:54 +0900
Subject: Prepare to release rubygems-3.2.1 and bundler-2.2.1

---
 lib/bundler.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lib/bundler.rb')

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 0ddd2c7f88..7a01de5ddb 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -212,6 +212,15 @@ module Bundler
         end
     end
 
+    def locked_bundler_version
+      return nil unless defined?(@definition) && @definition
+
+      locked_gems = definition.locked_gems
+      return nil unless locked_gems
+
+      locked_gems.bundler_version
+    end
+
     def ruby_scope
       "#{Bundler.rubygems.ruby_engine}/#{RbConfig::CONFIG["ruby_version"]}"
     end
@@ -602,8 +611,9 @@ EOF
       reset_rubygems!
     end
 
-    def reset_settings!
+    def reset_settings_and_root!
       @settings = nil
+      @root = nil
     end
 
     def reset_paths!
-- 
cgit v1.2.3