From 500149709b92ccb36396589a0c39afb3ff77bfb6 Mon Sep 17 00:00:00 2001
From: Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
Date: Fri, 30 Aug 2019 10:18:32 +0900
Subject: require 'pp' before use PP

`Kernel#pp` has wrapper, but `PP` does not.

https://github.com/ruby/ruby/runs/207405029#step:10:141
`NameError: uninitialized constant Bundler::Molinillo::Resolver::Resolution::PP`
---
 lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb | 1 +
 lib/rubygems/resolver.rb                                 | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
index b49acd4a48..ab6529ee3d 100644
--- a/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
+++ b/lib/bundler/vendor/molinillo/lib/molinillo/resolution.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+require 'pp'
 
 module Bundler::Molinillo
   class Resolver
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
index f74995713b..ea9687bdbf 100644
--- a/lib/rubygems/resolver.rb
+++ b/lib/rubygems/resolver.rb
@@ -125,7 +125,10 @@ class Gem::Resolver
 
     data = yield
     $stderr.printf "%10s (%d entries)\n", stage.to_s.upcase, data.size
-    PP.pp data, $stderr unless data.empty?
+    unless data.empty?
+      require 'pp'
+      PP.pp data, $stderr
+    end
   end
 
   ##
-- 
cgit v1.2.3