From 182700c609dd74b248c0408340cab8af586c0a18 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Wed, 23 Sep 2020 21:45:55 +0900 Subject: [PATCH] Merge pull request #3959 from rubygems/typofix Fix typo in `bundle pristine` warning message (cherry picked from commit d52796cfe93691f8e5b38611926bde6d3779e077) --- bundler/lib/bundler/cli/pristine.rb | 2 +- bundler/spec/commands/pristine_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bundler/lib/bundler/cli/pristine.rb b/bundler/lib/bundler/cli/pristine.rb index 53da90b415e1..d6654f805359 100644 --- a/bundler/lib/bundler/cli/pristine.rb +++ b/bundler/lib/bundler/cli/pristine.rb @@ -30,7 +30,7 @@ def run FileUtils.rm_rf spec.full_gem_path when Source::Git if source.local? - Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overriden.") + Bundler.ui.warn("Cannot pristine #{gem_name}. Gem is locally overridden.") next end diff --git a/bundler/spec/commands/pristine_spec.rb b/bundler/spec/commands/pristine_spec.rb index 20958ef3385c..6978f302c111 100644 --- a/bundler/spec/commands/pristine_spec.rb +++ b/bundler/spec/commands/pristine_spec.rb @@ -93,7 +93,7 @@ bundle "pristine" expect(changes_txt).to be_file - expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overriden.") + expect(err).to include("Cannot pristine #{spec.name} (#{spec.version}#{spec.git_version}). Gem is locally overridden.") end end