From 8e09b5e5fe72c81d1c23de7bd7832acc8326ea88 Mon Sep 17 00:00:00 2001
From: Justin Lambert <mastfish@gmail.com>
Date: Wed, 5 Aug 2015 10:44:00 +1000
Subject: 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.
---
 lib/bundler/cli/exec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/bundler/cli/exec.rb')

diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 283a99be..af22d7f7 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."
-- 
cgit v1.2.3