summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-02-28 02:30:15 +0000
committerSamuel Giddins <segiddins@segiddins.me>2017-03-03 17:37:20 -0600
commit6ce53a58e1b2c6ecbb70bc8cbb150ff59a9f603e (patch)
tree704e6d6a7a5ab0e827afcf6b4899c91cbd1b816d
parent26619e84e9f9596d61fc27586b177d5d23157c49 (diff)
downloadbundler-6ce53a58e1b2c6ecbb70bc8cbb150ff59a9f603e.tar.gz
Auto merge of #5482 - denniss:5369-fix-disable-checksum-validation-setting-name, r=segiddins
Fix disable.checksum_validation to disable_checksum_validation Fix https://github.com/bundler/bundler/issues/5369 (cherry picked from commit 26489ed0754c3f29af76be166a2122c7dc191af5)
-rw-r--r--lib/bundler/rubygems_gem_installer.rb2
-rw-r--r--spec/install/gems/compact_index_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/rubygems_gem_installer.rb b/lib/bundler/rubygems_gem_installer.rb
index 356e2e4470..977e13d948 100644
--- a/lib/bundler/rubygems_gem_installer.rb
+++ b/lib/bundler/rubygems_gem_installer.rb
@@ -43,7 +43,7 @@ module Bundler
If you wish to continue installing the downloaded gem, and are certain it does not pose a \
security issue despite the mismatching checksum, do the following:
- 1. run `bundle config disable.checksum_validation true` to turn off checksum verification
+ 1. run `bundle config disable_checksum_validation true` to turn off checksum verification
2. run `bundle install`
(More info: The expected SHA256 checksum was #{checksum.inspect}, but the \
diff --git a/spec/install/gems/compact_index_spec.rb b/spec/install/gems/compact_index_spec.rb
index fc2c8358c9..08b85bc820 100644
--- a/spec/install/gems/compact_index_spec.rb
+++ b/spec/install/gems/compact_index_spec.rb
@@ -723,7 +723,7 @@ The checksum of /versions does not match the checksum provided by the server! So
and include("1. delete the downloaded gem located at: `#{system_gem_path}/gems/rack-1.0.0/rack-1.0.0.gem`").
and include("2. run `bundle install`").
and include("If you wish to continue installing the downloaded gem, and are certain it does not pose a security issue despite the mismatching checksum, do the following:").
- and include("1. run `bundle config disable.checksum_validation true` to turn off checksum verification").
+ and include("1. run `bundle config disable_checksum_validation true` to turn off checksum verification").
and include("2. run `bundle install`").
and match(/\(More info: The expected SHA256 checksum was "#{"ab" * 22}", but the checksum for the downloaded gem was ".+?"\.\)/)
end