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

ruby-changes:68436

From: David <ko1@a...>
Date: Wed, 13 Oct 2021 23:30:34 +0900 (JST)
Subject: [ruby-changes:68436] df21600b98 (master): [rubygems/rubygems] Simplify some code

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

From df21600b98dfe58528e1ace9961b8eb6bbad5b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...>
Date: Wed, 25 Aug 2021 14:49:49 +0200
Subject: [rubygems/rubygems] Simplify some code

This method always receives an array, and we require `shellwords`
unconditionally at the top of the file, so `shelljoin` will always be
available.

https://github.com/rubygems/rubygems/commit/05c8ac641d
---
 lib/bundler/gem_helper.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/bundler/gem_helper.rb b/lib/bundler/gem_helper.rb
index c8fb74072a..dd1dc096f5 100644
--- a/lib/bundler/gem_helper.rb
+++ b/lib/bundler/gem_helper.rb
@@ -215,8 +215,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/lib/bundler/gem_helper.rb#L215
     def sh(cmd, &block)
       out, status = sh_with_status(cmd, &block)
       unless status.success?
-        cmd = cmd.shelljoin if cmd.respond_to?(:shelljoin)
-        raise("Running `#{cmd}` failed with the following output:\n\n#{out}\n")
+        raise("Running `#{cmd.shelljoin}` failed with the following output:\n\n#{out}\n")
       end
       out
     end
-- 
cgit v1.2.1


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

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