1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Merge RubyGems 2.7.1.

* Fix `gem update --system` with RubyGems 2.7+.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2017-11-06 02:02:04 +00:00
parent 4b7f531553
commit 54e58c947b
2 changed files with 6 additions and 2 deletions

View file

@ -10,7 +10,7 @@ require 'rbconfig'
require 'thread'
module Gem
VERSION = "2.7.0"
VERSION = "2.7.1"
end
# Must be first since it unloads the prelude from 1.9.2

View file

@ -352,8 +352,10 @@ By default, this RubyGems will install gem as:
def install_default_bundler_gem
return unless Gem::USE_BUNDLER_FOR_GEMDEPS
mkdir_p Gem::Specification.default_specifications_dir
bundler_spec = Gem::Specification.load("bundler/bundler.gemspec")
bundler_spec.files = Dir["bundler/{*.md,{lib,exe,man}/**/*}"]
bundler_spec.files = Dir.chdir("bundler") { Dir["{*.md,{lib,exe,man}/**/*}"] }
bundler_spec.executables -= %w[bundler bundle_ruby]
Dir.entries(Gem::Specification.default_specifications_dir).
select {|gs| gs.start_with?("bundler-") }.
@ -370,6 +372,8 @@ By default, this RubyGems will install gem as:
mkdir_p bundler_spec.bin_dir
bundler_spec.executables.each {|e| cp File.join("bundler", bundler_spec.bindir, e), File.join(bundler_spec.bin_dir, e) }
say "Bundler #{bundler_spec.version} installed"
end
def make_destination_dirs(install_destdir)