diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2021-07-23 21:32:07 +0200 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2021-08-31 19:06:14 +0900 |
commit | 8116b7fef7ccef49eda3d1258121bbf343daf12a (patch) | |
tree | 07327224a81b9ce87a9e512eb0956ebe227847af /lib/bundler/cli | |
parent | c6e5267a77871cba26152a00dcbaa05c1544bd13 (diff) |
[rubygems/rubygems] Move rescue block around the code that can raise it
https://github.com/rubygems/rubygems/commit/310937a546
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/4789
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r-- | lib/bundler/cli/install.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 42b9a3f47c..4c1915fea6 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -60,7 +60,7 @@ module Bundler installer = Installer.install(Bundler.root, definition, options) Bundler.settings.temporary(:cache_all_platforms => options[:local] ? false : Bundler.settings[:cache_all_platforms]) do - Bundler.load.cache if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle? + Bundler.load.cache(nil, options[:local]) if Bundler.app_cache.exist? && !options["no-cache"] && !Bundler.frozen_bundle? end Bundler.ui.confirm "Bundle complete! #{dependencies_count_for(definition)}, #{gems_installed_for(definition)}." @@ -83,12 +83,6 @@ module Bundler end Bundler::CLI::Common.output_fund_metadata_summary - rescue GemNotFound - if options[:local] - Bundler.ui.warn "Some gems seem to be missing from your #{Bundler.settings.app_cache_path} directory." - end - - raise rescue Gem::InvalidSpecificationException Bundler.ui.warn "You have one or more invalid gemspecs that need to be fixed." raise |