summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-05-12 12:44:17 +0000
committerBundlerbot <bot@bundler.io>2019-05-12 12:44:17 +0000
commitc9207d3e27f24f22279873de7257e41de9f9eed5 (patch)
tree40d01441593d718167469fa0b58c9c876360da4f
parenta2a69e382de2d35407f59665b5a45a75771bfe65 (diff)
parent3b779377f06f19c8d756a85aec70e837a4887cdf (diff)
downloadbundler-c9207d3e27f24f22279873de7257e41de9f9eed5.tar.gz
Merge #7156
7156: Improve fileutils require r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was there's [upstream changes in fileutils](https://github.com/ruby/fileutils/pull/35). ### What is your fix for the problem, implemented in this PR? My fix is to port the upstream changes, which consist of using `require_relative` everywhere. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
-rw-r--r--lib/bundler/vendor/fileutils/lib/fileutils.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/vendor/fileutils/lib/fileutils.rb b/lib/bundler/vendor/fileutils/lib/fileutils.rb
index fb7777eb49..6fbe741498 100644
--- a/lib/bundler/vendor/fileutils/lib/fileutils.rb
+++ b/lib/bundler/vendor/fileutils/lib/fileutils.rb
@@ -6,7 +6,7 @@ rescue LoadError
# for make mjit-headers
end
-require "bundler/vendor/fileutils/lib/fileutils/version"
+require_relative "fileutils/version"
#
# = fileutils.rb