From 97de4c02adf2c32c801eec5a683ae7d0c6dd6615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Sat, 31 Jul 2021 16:39:20 +0200 Subject: [PATCH] [rubygems/rubygems] Remove now unnecessary code https://github.com/rubygems/rubygems/commit/d74830d00b --- lib/bundler/cli/check.rb | 2 +- lib/bundler/definition.rb | 6 ------ lib/bundler/source.rb | 2 -- lib/bundler/source/rubygems.rb | 6 ------ lib/bundler/source_list.rb | 4 ---- 5 files changed, 1 insertion(+), 19 deletions(-) diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb index 65c51337d2..4221fc7f2b 100644 --- a/lib/bundler/cli/check.rb +++ b/lib/bundler/cli/check.rb @@ -15,7 +15,7 @@ module Bundler definition.validate_runtime! begin - definition.resolve_only_locally! + definition.resolve_with_cache! not_installed = definition.missing_specs rescue GemNotFound, VersionConflict Bundler.ui.error "Bundler can't satisfy your Gemfile's dependencies." diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 2bd1290cdd..621bda686e 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -166,12 +166,6 @@ module Bundler @multisource_allowed end - def resolve_only_locally! - @remote = false - sources.local_only! - resolve - end - def resolve_with_cache! sources.cached! resolve diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb index 434112ac8a..7bf493d73d 100644 --- a/lib/bundler/source.rb +++ b/lib/bundler/source.rb @@ -36,8 +36,6 @@ module Bundler def local!; end - def local_only!; end - def cached!; end def remote!; end diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 2e0ecb1aa6..298ff98e24 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -26,12 +26,6 @@ module Bundler Array(options["remotes"]).reverse_each {|r| add_remote(r) } end - def local_only! - @specs = nil - @allow_local = true - @allow_remote = false - end - def local! return if @allow_local diff --git a/lib/bundler/source_list.rb b/lib/bundler/source_list.rb index d6310b78c0..b97206f497 100644 --- a/lib/bundler/source_list.rb +++ b/lib/bundler/source_list.rb @@ -136,10 +136,6 @@ module Bundler different_sources?(lock_sources, replacement_sources) end - def local_only! - all_sources.each(&:local_only!) - end - def cached! all_sources.each(&:cached!) end