diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-07-25 03:33:50 +0000 |
|---|---|---|
| committer | The Bundler Bot <bot@bundler.io> | 2017-07-25 03:33:50 +0000 |
| commit | 219ea82fd4c84fcf047fc4cd957147600902288e (patch) | |
| tree | c0feb454837dc0de5df6666a81d48fc657ad9d3b /lib/bundler/source | |
| parent | c34f20a39b03d07f72089fa58bf5af24edd6b490 (diff) | |
| parent | 65c05e88eaba044117e80aa40c8a8e7ffc8f6a27 (diff) | |
| download | bundler-219ea82fd4c84fcf047fc4cd957147600902288e.tar.gz | |
Auto merge of #5860 - bundler:seg-validate-settings, r=segiddins
Introduce the notion of settings validation & default install to ./.bundle
Thanks so much for the contribution!
To make reviewing this PR a bit easier, please fill out answers to the following questions.
### What was the end-user problem that led to this PR?
The problem was...
### What was your diagnosis of the problem?
My diagnosis was...
### What is your fix for the problem, implemented in this PR?
My fix...
### Why did you choose this fix out of the possible options?
I chose this fix because...
Diffstat (limited to 'lib/bundler/source')
| -rw-r--r-- | lib/bundler/source/git.rb | 4 | ||||
| -rw-r--r-- | lib/bundler/source/rubygems.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/bundler/source/git.rb b/lib/bundler/source/git.rb index 020cf74766..eb605771f4 100644 --- a/lib/bundler/source/git.rb +++ b/lib/bundler/source/git.rb @@ -172,13 +172,11 @@ module Bundler print_using_message "Using #{version_message(spec)} from #{self}" - if requires_checkout? && !@copied && !force + if (requires_checkout? && !@copied) || force Bundler.ui.debug " * Checking out revision: #{ref}" git_proxy.copy_to(install_path, submodules) serialize_gemspecs_in(install_path) @copied = true - elsif force - git_proxy.copy_to(install_path, submodules) end generate_bin_options = { :disable_extensions => !Bundler.rubygems.spec_missing_extensions?(spec), :build_args => options[:build_args] } diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 0ac45b3d70..511216a5c5 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -377,7 +377,6 @@ module Bundler return false unless spec.remote spec.fetch_platform - Bundler.ui.confirm("Fetching #{version_message(spec)}") download_path = requires_sudo? ? Bundler.tmp(spec.full_name) : rubygems_dir gem_path = "#{rubygems_dir}/cache/#{spec.full_name}.gem" @@ -443,6 +442,7 @@ module Bundler end else uri = spec.remote.uri + Bundler.ui.confirm("Fetching #{version_message(spec)}") Bundler.rubygems.download_gem(spec, uri, download_path) cache_globally(spec, local_path) end |