From 631b34ef95cdcc6cb21eaae339176bd2b63a9bca Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Tue, 19 Jul 2022 12:44:51 +0000 Subject: [PATCH] [rubygems/rubygems] Bundler: change error/warning message for multiple global sources Signed-off-by: Takuya Noguchi https://github.com/rubygems/rubygems/commit/316564b8fc --- lib/bundler/dsl.rb | 4 ++-- spec/bundler/other/major_deprecation_spec.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb index 8b2d0ac97c..385fdd4383 100644 --- a/lib/bundler/dsl.rb +++ b/lib/bundler/dsl.rb @@ -465,12 +465,12 @@ module Bundler def multiple_global_source_warning if Bundler.feature_flag.bundler_3_mode? - msg = "This Gemfile contains multiple primary sources. " \ + msg = "This Gemfile contains multiple global sources. " \ "Each source after the first must include a block to indicate which gems " \ "should come from that source" raise GemfileEvalError, msg else - Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple primary sources. " \ + Bundler::SharedHelpers.major_deprecation 2, "Your Gemfile contains multiple global sources. " \ "Using `source` more than once without a block is a security risk, and " \ "may result in installing unexpected gems. To resolve this warning, use " \ "a block to indicate which gems should come from the secondary source." diff --git a/spec/bundler/other/major_deprecation_spec.rb b/spec/bundler/other/major_deprecation_spec.rb index af6bbbce48..e14b5ff003 100644 --- a/spec/bundler/other/major_deprecation_spec.rb +++ b/spec/bundler/other/major_deprecation_spec.rb @@ -414,7 +414,7 @@ RSpec.describe "major deprecations" do it "shows a deprecation", :bundler => "< 3" do expect(deprecations).to include( - "Your Gemfile contains multiple primary sources. " \ + "Your Gemfile contains multiple global sources. " \ "Using `source` more than once without a block is a security risk, and " \ "may result in installing unexpected gems. To resolve this warning, use " \ "a block to indicate which gems should come from the secondary source." @@ -425,7 +425,7 @@ RSpec.describe "major deprecations" do bundle "install" expect(deprecations).to include( - "Your Gemfile contains multiple primary sources. " \ + "Your Gemfile contains multiple global sources. " \ "Using `source` more than once without a block is a security risk, and " \ "may result in installing unexpected gems. To resolve this warning, use " \ "a block to indicate which gems should come from the secondary source." @@ -438,7 +438,7 @@ RSpec.describe "major deprecations" do bundle "install" expect(deprecations).to include( - "Your Gemfile contains multiple primary sources. " \ + "Your Gemfile contains multiple global sources. " \ "Using `source` more than once without a block is a security risk, and " \ "may result in installing unexpected gems. To resolve this warning, use " \ "a block to indicate which gems should come from the secondary source."