mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[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
This commit is contained in:
parent
aa87780f8f
commit
7d974cc56f
2 changed files with 2 additions and 2 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue