diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-03 12:24:38 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2022-08-03 13:14:10 +0900 |
commit | 71794a75db5d3da810146da106baf7eb5e86f745 (patch) | |
tree | c354ae515036c15a96a079712f3b7427c807be18 /lib/bundler/cli | |
parent | 8a1be433e8cac6ca5ded095f6fefbdc1009102b9 (diff) | |
download | ruby-71794a75db5d3da810146da106baf7eb5e86f745.tar.gz |
Merge rubygems/bundler HEAD
Pick from https://github.com/rubygems/rubygems/commit/8331e63263081a6aa690d8025d2957f30c4e814a
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r-- | lib/bundler/cli/platform.rb | 2 | ||||
-rw-r--r-- | lib/bundler/cli/viz.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb index 068c765aad..16d4e0145a 100644 --- a/lib/bundler/cli/platform.rb +++ b/lib/bundler/cli/platform.rb @@ -9,7 +9,7 @@ module Bundler def run platforms, ruby_version = Bundler.ui.silence do - locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version + locked_ruby_version = Bundler.locked_gems && Bundler.locked_gems.ruby_version.gsub(/p\d+\Z/, "") gemfile_ruby_version = Bundler.definition.ruby_version && Bundler.definition.ruby_version.single_version_string [Bundler.definition.platforms.map {|p| "* #{p}" }, locked_ruby_version || gemfile_ruby_version] diff --git a/lib/bundler/cli/viz.rb b/lib/bundler/cli/viz.rb index 644f9b25cf..5c09e00995 100644 --- a/lib/bundler/cli/viz.rb +++ b/lib/bundler/cli/viz.rb @@ -23,7 +23,7 @@ module Bundler Bundler.ui.warn "Make sure you have the graphviz ruby gem. You can install it with:" Bundler.ui.warn "`gem install ruby-graphviz`" rescue StandardError => e - raise unless e.message =~ /GraphViz not installed or dot not in PATH/ + raise unless e.message.to_s.include?("GraphViz not installed or dot not in PATH") Bundler.ui.error e.message Bundler.ui.warn "Please install GraphViz. On a Mac with Homebrew, you can run `brew install graphviz`." end |