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

ruby-changes:60218

From: V=C3=ADt <ko1@a...>
Date: Fri, 28 Feb 2020 14:32:43 +0900 (JST)
Subject: [ruby-changes:60218] 9bede6e942 (master): Fix wrong RegExp.

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

From 9bede6e942e7726d320d734fead741672d060625 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@r...>
Date: Thu, 27 Feb 2020 07:35:40 +0100
Subject: Fix wrong RegExp.

The missing `\` in PR #2922 causes the default gems to be installed from
the .gem packages instead from the expanded sources.

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 9cd9924..b1914d7 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -884,7 +884,7 @@ install?(:ext, :comm, :gem, :'bundled-gems') do https://github.com/ruby/ruby/blob/trunk/tool/rbinstall.rb#L884
   gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"
   extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
   File.foreach("#{srcdir}/gems/bundled_gems") do |name|
-    next unless /^(\S+)\s+(S+).*/ =~ name
+    next unless /^(\S+)\s+(\S+).*/ =~ name
     gem_name = "#$1-#$2"
     path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
     next unless File.exist?(path)
-- 
cgit v0.10.2


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

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