ruby-changes:61091
From: David <ko1@a...>
Date: Fri, 8 May 2020 14:14:01 +0900 (JST)
Subject: [ruby-changes:61091] fd5e4ca41f (master): [rubygems/rubygems] Remove unneeded untainting
https://git.ruby-lang.org/ruby.git/commit/?id=fd5e4ca41f From fd5e4ca41fe727d28ad8a6919f2feb342e6b9342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@r...> Date: Wed, 8 Apr 2020 20:56:29 +0200 Subject: [rubygems/rubygems] Remove unneeded untainting https://github.com/rubygems/rubygems/commit/ff223d8489 diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index c122287..a330157 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1637,8 +1637,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1637 assert_equal expected_specs, Gem.use_gemdeps.sort_by { |s| s.name } end - LIB_PATH = File.expand_path "../../../lib".dup.tap(&Gem::UNTAINT), __FILE__.dup.tap(&Gem::UNTAINT) - BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }.dup.tap(&Gem::UNTAINT) + LIB_PATH = File.expand_path "../../../lib".dup, __FILE__.dup + BUNDLER_LIB_PATH = File.expand_path $LOAD_PATH.find {|lp| File.file?(File.join(lp, "bundler.rb")) }.dup BUNDLER_FULL_NAME = "bundler-#{Bundler::VERSION}".freeze def add_bundler_full_name(names) @@ -1665,8 +1665,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1665 ENV['RUBYGEMS_GEMDEPS'] = "-" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup.tap(&Gem::UNTAINT), "-I#{LIB_PATH.tap(&Gem::UNTAINT)}", - "-I#{BUNDLER_LIB_PATH.tap(&Gem::UNTAINT)}", "-rrubygems"] + cmd = [Gem.ruby.dup, "-I#{LIB_PATH}", + "-I#{BUNDLER_LIB_PATH}", "-rrubygems"] cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" File.open path, "w" do |f| @@ -1703,8 +1703,8 @@ class TestGem < Gem::TestCase https://github.com/ruby/ruby/blob/trunk/test/rubygems/test_gem.rb#L1703 Dir.mkdir "sub1" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup.tap(&Gem::UNTAINT), "-Csub1", "-I#{LIB_PATH.tap(&Gem::UNTAINT)}", - "-I#{BUNDLER_LIB_PATH.tap(&Gem::UNTAINT)}", "-rrubygems"] + cmd = [Gem.ruby.dup, "-Csub1", "-I#{LIB_PATH}", + "-I#{BUNDLER_LIB_PATH}", "-rrubygems"] cmd << "-eputs Gem.loaded_specs.values.map(&:full_name).sort" File.open path, "w" do |f| -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/