summaryrefslogtreecommitdiff
path: root/lib/bundler/installer.rb
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2017-10-20 14:19:32 -0500
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:56 +0900
commitd761a0f6ffd443b3440ac5144edcdd8054db9c7c (patch)
treedd14a3ed0a4733c8a074a3db6e97a520d714d88c /lib/bundler/installer.rb
parent2ccb3db5fbd642f7e70c38aca946b2e010ce338b (diff)
[bundler/bundler] [Package] Always resolve remotely for --all-platforms
https://github.com/bundler/bundler/commit/e45d2272ea
Diffstat (limited to 'lib/bundler/installer.rb')
-rw-r--r--lib/bundler/installer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 5bc53a8b61..700f0a4737 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -296,7 +296,7 @@ module Bundler
# returns whether or not a re-resolve was needed
def resolve_if_needed(options)
- if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
+ if !@definition.unlocking? && !options["force"] && !options["all-platforms"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
return false if @definition.nothing_changed? && !@definition.missing_specs?
end