From 2dadf376ee8d23a3109a947329d46b92a3b72a53 Mon Sep 17 00:00:00 2001 From: Bundlerbot Date: Mon, 2 Dec 2019 10:13:57 +0000 Subject: Merge #7463 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7463: Vendor fileutils 1.4.1 r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was no big deal. Just a discrepancy between the fileutils version we're vendoring and the one that will ship with ruby 2.7. This doesn't cause any issues, but I prefer that they match. ### What is your fix for the problem, implemented in this PR? My fix is to `bin/rake vendor:fileutils[v1.4.1]` and commit the result. Co-authored-by: David Rodríguez (cherry picked from commit f6b970d0b8347681fdcf804a837876798a9230ef) --- lib/bundler/vendor/fileutils/lib/fileutils.rb | 6 +++--- lib/bundler/vendor/fileutils/lib/fileutils/version.rb | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 lib/bundler/vendor/fileutils/lib/fileutils/version.rb diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb index c1988dceab..8f8faf30c8 100644 --- a/lib/bundler/vendor/fileutils/lib/fileutils.rb +++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb @@ -6,8 +6,6 @@ rescue LoadError # for make mjit-headers end -require_relative "fileutils/version" - # # = fileutils.rb # @@ -104,6 +102,7 @@ require_relative "fileutils/version" # :verbose flags to methods in Bundler::FileUtils. # module Bundler::FileUtils + VERSION = "1.4.1" def self.private_module_function(name) #:nodoc: module_function name @@ -1300,7 +1299,8 @@ module Bundler::FileUtils .reject {|n| n == '.' or n == '..' } end - files.map {|n| Entry_.new(prefix(), join(rel(), n.tap{|x| x.untaint if RUBY_VERSION < "2.7" })) } + untaint = RUBY_VERSION < '2.7' + files.map {|n| Entry_.new(prefix(), join(rel(), untaint ? n.untaint : n)) } end def stat diff --git a/lib/bundler/vendor/fileutils/lib/fileutils/version.rb b/lib/bundler/vendor/fileutils/lib/fileutils/version.rb deleted file mode 100644 index b8f616e4fb..0000000000 --- a/lib/bundler/vendor/fileutils/lib/fileutils/version.rb +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -module Bundler::FileUtils - VERSION = "1.3.0" -end -- cgit v1.2.1