diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-08-12 13:40:36 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2022-08-12 15:55:40 +0900 |
commit | a3a6d2d9a390697dfd0ae9f808cb301680a6f24a (patch) | |
tree | 98a08a074dd4abb6b1c640c7e47c789f26dd2148 /tool | |
parent | 04815ea968ebef616cfdb316840158f6c87a7277 (diff) |
No bundled gems to be installed from gem now
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6234
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/rbinstall.rb | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index e6fff940ee..e6d0f592f5 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb @@ -1071,28 +1071,8 @@ install?(:ext, :comm, :gem, :'bundled-gems') do prepare "bundled gem cache", gem_dir+"/cache" install installed_gems, gem_dir+"/cache" end - next if gems.empty? - if defined?(Zlib) - silent = Gem::SilentUI.new - gems.each do |gem| - package = Gem::Package.new(gem) - inst = RbInstall::GemInstaller.new(package, options) - inst.spec.extension_dir = "#{extensions_dir}/#{inst.spec.full_name}" - begin - Gem::DefaultUserInteraction.use_ui(silent) {inst.install} - rescue Gem::InstallError - next - end - gemname = File.basename(gem) - puts "#{INDENT}#{gemname}" - end - # fix directory permissions - # TODO: Gem.install should accept :dir_mode option or something - File.chmod($dir_mode, *Dir.glob(install_dir+"/**/")) - # fix .gemspec permissions - File.chmod($data_mode, *Dir.glob(install_dir+"/specifications/*.gemspec")) - else - puts "skip installing bundled gems because of lacking zlib" + unless gems.empty? + puts "skipped bundled gems: #{gems.join(' ')}" end end |