[前][次][番号順一覧][スレッド一覧]

ruby-changes:58719

From: Yusuke <ko1@a...>
Date: Tue, 12 Nov 2019 01:47:47 +0900 (JST)
Subject: [ruby-changes:58719] b72eda3c59 (master): lib/rubygems.rb: Suppress "Resolving dependencies..."

https://git.ruby-lang.org/ruby.git/commit/?id=b72eda3c59

From b72eda3c59cd0a15ed3536a3c0cd8aebd225f16b Mon Sep 17 00:00:00 2001
From: Yusuke Endoh <mame@r...>
Date: Tue, 12 Nov 2019 01:25:42 +0900
Subject: lib/rubygems.rb: Suppress "Resolving dependencies..."

And suppress "Leaked file descriptor" again.

diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 8883936..c780c79 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -1214,13 +1214,12 @@ An Array (#{env.inspect}) was passed in from #{caller[3]} https://github.com/ruby/ruby/blob/trunk/lib/rubygems.rb#L1214
     Gem::DefaultUserInteraction.use_ui(ui) do
       require "bundler"
       begin
-        @gemdeps = Bundler.setup
-      ensure
-        if Gem::DefaultUserInteraction.ui.is_a?(Gem::SilentUI)
-          Gem::DefaultUserInteraction.ui.close
+        Bundler.ui.silence do
+          @gemdeps = Bundler.setup
         end
+      ensure
+        Gem::DefaultUserInteraction.ui.close
       end
-      Bundler.ui = nil
       @gemdeps.requested_specs.map(&:to_spec).sort_by(&:name)
     end
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]