summaryrefslogtreecommitdiff
path: root/lib/bundler/inline.rb
diff options
context:
space:
mode:
authorBundlerbot <bot@bundler.io>2019-08-27 06:49:23 +0000
committerBundlerbot <bot@bundler.io>2019-08-27 06:49:23 +0000
commitb3e1177d4b64cc154b85a3b70bf0b7acd44d98bc (patch)
tree2a2ce7cca2ce4fea33c41385f0c31a203859face /lib/bundler/inline.rb
parent31414dd7768d6492b5174a349cbf0ab5c12c9989 (diff)
parentb5766564fb6ad9c74c3b87ad6b2965f3b9095d08 (diff)
downloadbundler-b3e1177d4b64cc154b85a3b70bf0b7acd44d98bc.tar.gz
Merge #7329
7329: Undo auto multiplatform r=deivid-rodriguez a=deivid-rodriguez ### What was the end-user problem that led to this PR? The problem was that since #7215, more Gemfiles are going to fail resolution because of the current issues with multiplatform support, and that we'll be pushing current multiplatform problems into all users because bundler will resolve and lock all platforms included on a Gemfile by default. ### What was your diagnosis of the problem? My diagnosis was that we probably need better multiplatform support before we start resolving all platforms by default. ### What is your fix for the problem, implemented in this PR? My fix is to revert the relevant commits from #7215. I'll try to revisit in the future. ### Why did you choose this fix out of the possible options? I chose this fix because it goes back to how things were before. Closes #7315. Co-authored-by: David Rodríguez <deivid.rodriguez@riseup.net>
Diffstat (limited to 'lib/bundler/inline.rb')
-rw-r--r--lib/bundler/inline.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index c7c58de52b..dbf737c7ee 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -58,7 +58,7 @@ def gemfile(install = false, options = {}, &gemfile)
Bundler.ui = ui if install
if install || missing_specs.call
- Bundler.settings.temporary(:inline => true) do
+ Bundler.settings.temporary(:inline => true, :disable_platform_warnings => true) do
installer = Bundler::Installer.install(Bundler.root, definition, :system => true)
installer.post_install_messages.each do |name, message|
Bundler.ui.info "Post-install message from #{name}:\n#{message}"