diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/source/rubygems.rb | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb index 02ad967c2a..4b9a781c82 100644 --- a/lib/bundler/definition.rb +++ b/lib/bundler/definition.rb @@ -923,7 +923,7 @@ module Bundler pinned_names = [] default = Bundler.feature_flag.lockfile_uses_separate_rubygems_sources? && sources.default_source @dependencies.each do |dep| - dep_source = dep.source || default + next unless dep_source = dep.source || default next if dep_source == skip pinned_names << dep.name end diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb index 02835a5485..6f4157364f 100644 --- a/lib/bundler/source/rubygems.rb +++ b/lib/bundler/source/rubygems.rb @@ -260,7 +260,11 @@ module Bundler unmet_dependency_names = unmet_dependency_names.call unless unmet_dependency_names.nil? - unmet_dependency_names -= remote_specs.spec_names # avoid re-fetching things we've already gotten + if api_fetchers.size <= 1 + # can't do this when there are multiple fetchers because then we might not fetch from _all_ + # of them + unmet_dependency_names -= remote_specs.spec_names # avoid re-fetching things we've already gotten + end return if unmet_dependency_names.empty? end |