diff options
author | Bundlerbot <bot@bundler.io> | 2019-07-08 10:04:19 +0000 |
---|---|---|
committer | Bundlerbot <bot@bundler.io> | 2019-07-08 10:04:19 +0000 |
commit | b4ca6d350750a864286e177f00a63c4c80c05e34 (patch) | |
tree | 04b69f7852399660995dc52e6df4d66862a6270a | |
parent | 7ecc54af67b5b15a7467c296b0712df1acddfeb2 (diff) | |
parent | 0b40b5b7843439ff9bf7fe09bdf0d789a84f8626 (diff) | |
download | bundler-b4ca6d350750a864286e177f00a63c4c80c05e34.tar.gz |
Merge #7224
7224: Remove unnecessary `order_matters` param r=hsbt a=deivid-rodriguez
### What was the end-user problem that led to this PR?
The problem was that the `find_gemfile` method was receiving an `order_matters` parameter that's no longer used anywhere.
### What is your fix for the problem, implemented in this PR?
My fix is to remove the parameter.
Co-authored-by: David RodrÃguez <deivid.rodriguez@riseup.net>
-rw-r--r-- | lib/bundler/shared_helpers.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bundler/shared_helpers.rb b/lib/bundler/shared_helpers.rb index d259f20e6b..614e09f746 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -20,7 +20,7 @@ module Bundler end def default_gemfile - gemfile = find_gemfile(:order_matters) + gemfile = find_gemfile raise GemfileNotFound, "Could not locate Gemfile" unless gemfile Pathname.new(gemfile).untaint.expand_path end @@ -226,7 +226,7 @@ module Bundler raise Bundler::PathError, message end - def find_gemfile(order_matters = false) + def find_gemfile given = ENV["BUNDLE_GEMFILE"] return given if given && !given.empty? find_file(*gemfile_names) @@ -291,7 +291,7 @@ module Bundler # for Ruby core repository exe_file = File.expand_path("../../../../bin/bundle", __FILE__) unless File.exist?(exe_file) Bundler::SharedHelpers.set_env "BUNDLE_BIN_PATH", exe_file - Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile(:order_matters).to_s + Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", find_gemfile.to_s Bundler::SharedHelpers.set_env "BUNDLER_VERSION", Bundler::VERSION end |