summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-08-17 22:00:52 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-21 07:58:46 +0900
commit5ea08883cfc90e05e5fb76e1e10cee1818a40c9e (patch)
tree62f39c387e9663c62ab2c250365f57f3517c2db0 /lib
parent864f23a457291e64cb6a0703dcc0b3e26e4cf109 (diff)
[bundler/bundler] Remove old rubies stuff no longer needed
https://github.com/bundler/bundler/commit/36fb3287f4
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/cli/exec.rb2
-rw-r--r--lib/bundler/spec_set.rb6
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