summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2017-11-26 23:11:03 -0800
committerAndre Arko <andre@arko.net>2017-11-26 23:11:03 -0800
commit4dfb32241a4af5d115f65ba8b17aa9bfcde19c57 (patch)
tree525c849cf153f5474554ce37e6f929fa55872407 /lib/bundler
parent914a4a8b8d0cf1a79dbc7b334fbb5c2db1ecdc16 (diff)
downloadbundler-4dfb32241a4af5d115f65ba8b17aa9bfcde19c57.tar.gz
Stop overriding specs during double-checks
This fixes my test-case reproduction of #6072. I’m pretty sure it’s because the double-check was overriding the locally installed index specs with specs fetched from the RubyGems API, causing Bundler to conclude that the gems aren’t installed, even though they are.
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/definition.rb2
-rw-r--r--lib/bundler/source/rubygems.rb6
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 0ef920638b..264a948d41 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -294,7 +294,7 @@ module Bundler
end
sources.all_sources.each do |source|
- source.double_check_for(unmet_dependency_names, :override_dupes)
+ source.double_check_for(unmet_dependency_names)
end
break if idxcount == idx.size
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index 45ff3d17b3..3ba7641f84 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -258,10 +258,8 @@ module Bundler
end
end
- def double_check_for(unmet_dependency_names, override_dupes = false, index = specs)
+ def double_check_for(unmet_dependency_names)
return unless @allow_remote
- raise ArgumentError, "missing index" unless index
-
return unless api_fetchers.any?
unmet_dependency_names = unmet_dependency_names.call
@@ -276,7 +274,7 @@ module Bundler
Bundler.ui.debug "Double checking for #{unmet_dependency_names || "all specs (due to the size of the request)"} in #{self}"
- fetch_names(api_fetchers, unmet_dependency_names, index, override_dupes)
+ fetch_names(api_fetchers, unmet_dependency_names, specs, false)
end
def dependency_names_to_double_check