summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lambert <mastfish@gmail.com>2015-08-05 10:44:00 +1000
committerJustin Lambert <mastfish@gmail.com>2015-08-05 10:44:00 +1000
commit8e09b5e5fe72c81d1c23de7bd7832acc8326ea88 (patch)
treee8a3cfdbc8b9cc987ddbc87e69b60b953e0ec220
parent621f182de493c0e408fe920e116a6b98f92acf93 (diff)
downloadbundler-8e09b5e5fe72c81d1c23de7bd7832acc8326ea88.tar.gz
Fix for warning on jruby 9k
Jruby 9k is ruby 2.2.2, but doesn't support processes. So running `bundle exec` leads to a warning `warning: unsupported exec option: close_others`. This should fix that warning.
-rw-r--r--lib/bundler/cli/exec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 283a99be4b..af22d7f7ba 100644
--- a/lib/bundler/cli/exec.rb
+++ b/lib/bundler/cli/exec.rb
@@ -9,7 +9,7 @@ module Bundler
@cmd = args.shift
@args = args
- if Bundler.current_ruby.ruby_2?
+ if Bundler.current_ruby.ruby_2? && (!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."