diff options
| -rw-r--r-- | lib/bundler/definition.rb | 2 | ||||
| -rw-r--r-- | lib/bundler/spec_set.rb | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -760,7 +760,7 @@ module Bundler end end - @platforms = result.add_extra_platforms!(platforms) if should_add_extra_platforms? SpecSet.new(result.for(dependencies, @platforms | [Gem::Platform::RUBY])) end @@ -48,7 +48,10 @@ module Bundler end def add_extra_platforms!(platforms) - return platforms.concat([Gem::Platform::RUBY]).uniq if @specs.empty? new_platforms = all_platforms.select do |platform| next if platforms.include?(platform) @@ -56,14 +59,12 @@ module Bundler complete_platform(platform) end - return platforms if new_platforms.empty? platforms.concat(new_platforms) less_specific_platform = new_platforms.find {|platform| platform != Gem::Platform::RUBY && Bundler.local_platform === platform && platform === Bundler.local_platform } platforms.delete(Bundler.local_platform) if less_specific_platform - - platforms end def validate_deps(s) |