diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-11-11 15:03:57 +0900 |
|---|---|---|
| committer | SHIBATA Hiroshi <hsbt@ruby-lang.org> | 2019-11-11 16:59:49 +0900 |
| commit | 7d463e360b9c4718b17378eb52783116a01b884b (patch) | |
| tree | ee6951d298d76fcbf0c5e062712e54de56a3fa39 /lib/rubygems/installer.rb | |
| parent | 31416423809f64d4b5ea6b9651cced3179cc5ced (diff) | |
| download | ruby-7d463e360b9c4718b17378eb52783116a01b884b.tar.gz | |
Merge RubyGems 3.1.0.pre3
* Fix gem pristine not accounting for user installed gems. Pull request
#2914 by Luis Sagastume.
* Refactor keyword argument test for Ruby 2.7. Pull request #2947 by
SHIBATA Hiroshi.
* Fix errors at frozen Gem::Version. Pull request #2949 by Nobuyoshi
Nakada.
* Remove taint usage on Ruby 2.7+. Pull request #2951 by Jeremy Evans.
* Check Manifest.txt is up to date. Pull request #2953 by David Rodríguez.
* Clarify symlink conditionals in tests. Pull request #2962 by David
Rodríguez.
* Update command line parsing to work under ps. Pull request #2966 by
David Rodríguez.
* Properly test `Gem::Specifications.stub_for`. Pull request #2970 by
David Rodríguez.
* Fix Gem::LOADED_SPECS_MUTEX handling for recursive locking. Pull request
#2985 by MSP-Greg.
Diffstat (limited to 'lib/rubygems/installer.rb')
| -rw-r--r-- | lib/rubygems/installer.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb index 0ffddc52fc..ad39ec81bf 100644 --- a/lib/rubygems/installer.rb +++ b/lib/rubygems/installer.rb @@ -196,8 +196,6 @@ class Gem::Installer @package.prog_mode = options[:prog_mode] @package.data_mode = options[:data_mode] - @bin_dir = options[:bin_dir] if options[:bin_dir] - if options[:user_install] @gem_home = Gem.user_dir @bin_dir = Gem.bindir gem_home unless options[:bin_dir] @@ -394,7 +392,7 @@ class Gem::Installer specs = [] Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path| - spec = Gem::Specification.load path.untaint + spec = Gem::Specification.load path.tap(&Gem::UNTAINT) specs << spec if spec end @@ -502,7 +500,7 @@ class Gem::Installer raise Gem::FilePermissionError.new(@bin_dir) unless File.writable? @bin_dir spec.executables.each do |filename| - filename.untaint + filename.tap(&Gem::UNTAINT) bin_path = File.join gem_dir, spec.bindir, filename unless File.exist? bin_path @@ -633,7 +631,7 @@ class Gem::Installer def ensure_loadable_spec ruby = spec.to_ruby_for_cache - ruby.untaint + ruby.tap(&Gem::UNTAINT) begin eval ruby |