Merge pull request #2800 from TimMoore/1-5-stable

Restore cache updating when using --local.

3 files changed, 1 insertions, 5 deletions

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
index 20c682602f..899ee8bba2 100644
--- a/lib/bundler/cli.rb
+++ b/lib/bundler/cli.rb
@@ -232,8 +232,6 @@ module Bundler
         opts[:system] = true
       end
 
-      opts["no-cache"] ||= opts[:local]
-
       Bundler.settings[:path]     = nil if opts[:system]
       Bundler.settings[:path]     = "vendor/bundle" if opts[:deployment]
       Bundler.settings[:path]     = opts["path"] if opts["path"]
diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn
index 2af9c45d3a..92a1923e60 100644
--- a/man/bundle-install.ronn
+++ b/man/bundle-install.ronn
@@ -61,7 +61,7 @@ update process below under [CONSERVATIVE UPDATING][].
   Do not attempt to connect to `rubygems.org`, instead using just
   the gems already present in Rubygems' cache or in `vendor/cache`.
   Note that if a more appropriate platform-specific gem exists on
-  `rubygems.org`, it will not be found. This option implies `--no-cache`.
+  `rubygems.org`, it will not be found.
 
 * `--deployment`:
   Switches bundler's defaults into [deployment mode][DEPLOYMENT MODE].
diff --git a/spec/install/gems/packed_spec.rb b/spec/install/gems/packed_spec.rb
index 1992f5d342..9825b84f5e 100644
--- a/spec/install/gems/packed_spec.rb
+++ b/spec/install/gems/packed_spec.rb
@@ -14,7 +14,6 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --local"
-      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end
 
@@ -30,7 +29,6 @@ describe "bundle install with gem sources" do
       FileUtils.rm_rf gem_repo2
 
       bundle "install --deployment"
-      expect(out).not_to include("Updating files in vendor/cache")
       should_be_installed "rack 1.0.0"
     end