diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-05-21 21:05:07 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2020-05-22 20:32:30 +0900 |
| commit | 1d889c96562e9619d2cab443da711e82daeb983c (patch) | |
| tree | 0a6a142360be987ceaff6cbf24a03fd5797ecb66 /lib/bundler/source | |
| parent | 93ebf9643dc0913693157e6b4bb391a549a9b8ae (diff) | |
| download | ruby-1d889c96562e9619d2cab443da711e82daeb983c.tar.gz | |
Sync Bundler PR #3624 with HEAD commits
Diffstat (limited to 'lib/bundler/source')
| -rw-r--r-- | lib/bundler/source/rubygems.rb | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 6c0de204e7..ee11feda5c 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -145,20 +145,17 @@ module Bundler Bundler.mkdir_p bin_path, :no_sudo => true unless spec.executables.empty? || Bundler.rubygems.provides?(">= 2.7.5") - installed_spec = nil - Bundler.rubygems.preserve_paths do - installed_spec = Bundler::RubyGemsGemInstaller.at( - path, - :install_dir => install_path.to_s, - :bin_dir => bin_path.to_s, - :ignore_dependencies => true, - :wrappers => true, - :env_shebang => true, - :build_args => opts[:build_args], - :bundler_expected_checksum => spec.respond_to?(:checksum) && spec.checksum, - :bundler_extension_cache_path => extension_cache_path(spec) - ).install - end + installed_spec = Bundler::RubyGemsGemInstaller.at( + path, + :install_dir => install_path.to_s, + :bin_dir => bin_path.to_s, + :ignore_dependencies => true, + :wrappers => true, + :env_shebang => true, + :build_args => opts[:build_args], + :bundler_expected_checksum => spec.respond_to?(:checksum) && spec.checksum, + :bundler_extension_cache_path => extension_cache_path(spec) + ).install spec.full_gem_path = installed_spec.full_gem_path # SUDO HAX |