mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
[bundler/bundler] Revert "Remove now meaningless warning"
This reverts commit 00b095b98fe4bd44950beaf3bc9f1d91eac7b69e. https://github.com/bundler/bundler/commit/e93bce3b20
This commit is contained in:
parent
f18d88b535
commit
6f16ededdd
2 changed files with 30 additions and 1 deletions
|
@ -896,7 +896,17 @@ module Bundler
|
|||
dependencies.each do |dep|
|
||||
dep = Dependency.new(dep, ">= 0") unless dep.respond_to?(:name)
|
||||
next if !remote && !dep.current_platform?
|
||||
dep.gem_platforms(sorted_platforms).each do |p|
|
||||
platforms = dep.gem_platforms(sorted_platforms)
|
||||
if platforms.empty? && !Bundler.settings[:disable_platform_warnings]
|
||||
mapped_platforms = dep.expanded_platforms
|
||||
Bundler.ui.warn \
|
||||
"The dependency #{dep} will be unused by any of the platforms Bundler is installing for. " \
|
||||
"Bundler is installing for #{@platforms.join ", "} but the dependency " \
|
||||
"is only for #{mapped_platforms.join ", "}. " \
|
||||
"To add those platforms to the bundle, " \
|
||||
"run `bundle lock --add-platform #{mapped_platforms.join " "}`."
|
||||
end
|
||||
platforms.each do |p|
|
||||
deps << DepProxy.new(dep, p) if remote || p == generic_local_platform
|
||||
end
|
||||
end
|
||||
|
|
|
@ -406,6 +406,25 @@ RSpec.describe "bundle install with platform conditionals" do
|
|||
#{Bundler::VERSION}
|
||||
L
|
||||
end
|
||||
|
||||
context "when disable_platform_warnings is true" do
|
||||
before { bundle! "config set disable_platform_warnings true" }
|
||||
|
||||
it "does not print the warning when a dependency is unused on any platform" do
|
||||
simulate_platform "ruby"
|
||||
simulate_ruby_engine "ruby"
|
||||
|
||||
gemfile <<-G
|
||||
source "#{file_uri_for(gem_repo1)}"
|
||||
|
||||
gem "rack", :platform => [:mingw, :mswin, :x64_mingw, :jruby]
|
||||
G
|
||||
|
||||
bundle! "install"
|
||||
|
||||
expect(out).not_to match(/The dependency (.*) will be unused/)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
RSpec.describe "when a gem has no architecture" do
|
||||
|
|
Loading…
Reference in a new issue