diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2018-11-21 11:18:10 +0100 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-08-03 09:29:56 +0900 |
commit | 5a56f4a541a07bb8eb600078236727e6837082e3 (patch) | |
tree | 4529ae8fe6094a7d8cb68df802a638532ed232b4 | |
parent | a375a4518f95dbd8f6c32840041d2847c79c3e98 (diff) | |
download | ruby-5a56f4a541a07bb8eb600078236727e6837082e3.tar.gz |
[bundler/bundler] Remove unnecessary `order_matters` param
https://github.com/bundler/bundler/commit/0b40b5b784
-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 57595d3130..c5fa659a7b 100644 --- a/lib/bundler/shared_helpers.rb +++ b/lib/bundler/shared_helpers.rb @@ -19,7 +19,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 @@ -225,7 +225,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) @@ -290,7 +290,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 |