diff options
| author | Sutou Kouhei <kou@clear-code.com> | 2020-01-17 09:51:11 +0900 |
|---|---|---|
| committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-17 09:51:31 +0900 |
| commit | a634e0a6c64b69e3bd5d8d528d7b311e73e31c58 (patch) | |
| tree | 01967da3835a667f72828e566a928f2b3286118d /lib | |
| parent | 3ca83a01484351fd4158a8b077409a4cc026e8dd (diff) | |
| download | bundler-a634e0a6c64b69e3bd5d8d528d7b311e73e31c58.tar.gz | |
Revert MatchPlatform#platforms_match?
Because some examples are failed:
rspec ./spec/cache/gems_spec.rb:236 # bundle cache when previously cached doesn't remove gems that are for another platform
rspec ./spec/commands/install_spec.rb:220 # bundle install with gem sources the simple case with a gem that installs multiple platforms installs gems for the local platform as first choice
rspec ./spec/commands/update_spec.rb:39 # bundle update with --all updates the entire bundle
rspec ./spec/commands/update_spec.rb:49 # bundle update with --all doesn't delete the Gemfile.lock file if something goes wrong
rspec ./spec/commands/update_spec.rb:104 # bundle update with a top level dependency unlocks all child dependencies that are unrelated to other locked dependencies
rspec ./spec/commands/update_spec.rb:115 # bundle update with an unknown dependency should inform the user
rspec ./spec/commands/update_spec.rb:119 # bundle update with an unknown dependency should suggest alternatives
rspec ./spec/commands/update_spec.rb:126 # bundle update with a child dependency should update the child dependency
rspec ./spec/commands/update_spec.rb:299 # bundle update in a frozen bundle should suggest different command when frozen is set globally
rspec ./spec/runtime/platform_spec.rb:60 # Bundler.setup with multi platform stuff will add the resolve for the current platform
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bundler/match_platform.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/bundler/match_platform.rb b/lib/bundler/match_platform.rb index 81d85d8e46..69074925a6 100644 --- a/lib/bundler/match_platform.rb +++ b/lib/bundler/match_platform.rb @@ -15,10 +15,7 @@ module Bundler return true if Gem::Platform::RUBY == gemspec_platform return true if local_platform == gemspec_platform gemspec_platform = Gem::Platform.new(gemspec_platform) - generic_gemspec_platform = GemHelpers.generic(gemspec_platform) - unless generic_gemspec_platform == Gem::Platform::RUBY - return true if generic_gemspec_platform === local_platform - end + return true if GemHelpers.generic(gemspec_platform) === local_platform return true if gemspec_platform === local_platform false |