diff options
author | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-17 22:00:52 +0200 |
---|---|---|
committer | David RodrÃguez <deivid.rodriguez@riseup.net> | 2019-08-18 00:18:00 +0200 |
commit | 36fb3287f4e8fa7688b50e40600e78cb618d9703 (patch) | |
tree | 2536fef5806b596489c089654db2ab3d9e5a4cf7 /lib | |
parent | 33a65c256717db8d1229d2e7dbbc7265a3933c05 (diff) | |
download | bundler-36fb3287f4e8fa7688b50e40600e78cb618d9703.tar.gz |
Remove old rubies stuff no longer needed
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bundler/cli/exec.rb | 2 | ||||
-rw-r--r-- | lib/bundler/spec_set.rb | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb index 5dcf4a01ef..0b0e991ea5 100644 --- a/lib/bundler/cli/exec.rb +++ b/lib/bundler/cli/exec.rb @@ -13,7 +13,7 @@ module Bundler @cmd = args.shift @args = args - if Bundler.current_ruby.ruby_2? && !Bundler.current_ruby.jruby? + if !Bundler.current_ruby.jruby? @args << { :close_others => !options.keep_file_descriptors? } elsif options.keep_file_descriptors? Bundler.ui.warn "Ruby version #{RUBY_VERSION} defaults to keeping non-standard file descriptors on Kernel#exec." diff --git a/lib/bundler/spec_set.rb b/lib/bundler/spec_set.rb index 2c5d9e6580..463113ef8e 100644 --- a/lib/bundler/spec_set.rb +++ b/lib/bundler/spec_set.rb @@ -162,11 +162,7 @@ module Bundler end def extract_circular_gems(error) - if Bundler.current_ruby.mri? && Bundler.current_ruby.on_19? - error.message.scan(/(\w+) \([^)]/).flatten - else - error.message.scan(/@name="(.*?)"/).flatten - end + error.message.scan(/@name="(.*?)"/).flatten end def lookup |