diff options
| author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-11-17 14:09:50 +0100 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2021-12-03 20:00:50 +0900 |
| commit | 7d974cc56fa0555beed0bf4f6fe34322cd24cd26 (patch) | |
| tree | d3448fda729aafd7825418cc5f3c5af7ff04334f | |
| parent | aa87780f8f27253e216d4883dd4cae84d545ec1b (diff) | |
[rubygems/rubygems] Don't overwrite locked dependency sources too early
Otherwise we hide some useful message about dependency source changes.
https://github.com/rubygems/rubygems/commit/c926673c5b
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | spec/bundler/install/deploy_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 9fa62fedca..0c29cdc62f 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -644,7 +644,7 @@ module Bundler end def converge_dependencies - (@dependencies + locked_dependencies).each do |dep| + @dependencies.each do |dep| if dep.source dep.source = sources.get(dep.source) end diff --git a/spec/bundler/install/deploy_spec.rb b/spec/bundler/install/deploy_spec.rb index 3604157155..e2ca96993f 100644 --- a/spec/bundler/install/deploy_spec.rb +++ b/spec/bundler/install/deploy_spec.rb @@ -379,7 +379,7 @@ RSpec.describe "install in deployment or frozen mode" do expect(err).to include("deployment mode") expect(err).to include("You have deleted from the Gemfile:\n* source: #{lib_path("rack-1.0")}") expect(err).not_to include("You have added to the Gemfile") - expect(err).not_to include("You have changed in the Gemfile") + expect(err).to include("You have changed in the Gemfile:\n* rack from `#{lib_path("rack-1.0")}` to `no specified source`") end it "explodes if you unpin a source, leaving it pinned somewhere else" do |
