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/request_set | |
| 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/request_set')
| -rw-r--r-- | lib/rubygems/request_set/gem_dependency_api.rb | 2 | ||||
| -rw-r--r-- | lib/rubygems/request_set/lockfile.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/rubygems/request_set/gem_dependency_api.rb b/lib/rubygems/request_set/gem_dependency_api.rb index cb36a62e10..b7a8ee6f4f 100644 --- a/lib/rubygems/request_set/gem_dependency_api.rb +++ b/lib/rubygems/request_set/gem_dependency_api.rb @@ -280,7 +280,7 @@ class Gem::RequestSet::GemDependencyAPI # Loads the gem dependency file and returns self. def load - instance_eval File.read(@path).untaint, @path, 1 + instance_eval File.read(@path).tap(&Gem::UNTAINT), @path, 1 self end diff --git a/lib/rubygems/request_set/lockfile.rb b/lib/rubygems/request_set/lockfile.rb index 0776cf82e3..5423f2c14f 100644 --- a/lib/rubygems/request_set/lockfile.rb +++ b/lib/rubygems/request_set/lockfile.rb @@ -79,7 +79,9 @@ class Gem::RequestSet::Lockfile @gem_deps_file = File.expand_path(gem_deps_file) @gem_deps_dir = File.dirname(@gem_deps_file) - @gem_deps_file.untaint unless gem_deps_file.tainted? + if RUBY_VERSION < '2.7' + @gem_deps_file.untaint unless gem_deps_file.tainted? + end @platforms = [] end |