dinislage/foreman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #291 from liveh2o/master

Browse Source 
JRuby 1.9 doesn't require posix/spawn
This commit is contained in:
David Dollar
2013-01-14 05:08:10 -08:00
parent 92c1909217 7ad41da592
commit cd2c255296
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/foreman.rb
+2 -2
View File
@@ -8,8 +8,8 @@ module Foreman
File.expand_path("../../bin/foreman-runner", __FILE__) File.expand_path("../../bin/foreman-runner", __FILE__)
end end
def self.jruby? def self.jruby_18?
defined?(RUBY_PLATFORM) and RUBY_PLATFORM == "java" defined?(RUBY_PLATFORM) and RUBY_PLATFORM == "java" and ruby_18?
end end
def self.ruby_18? def self.ruby_18?
lib/foreman/process.rb
+1 -1
View File
@@ -53,7 +53,7 @@ class Foreman::Process
Dir.chdir(cwd) do Dir.chdir(cwd) do
Process.spawn env, expanded_command(env), :out => output, :err => output Process.spawn env, expanded_command(env), :out => output, :err => output
end end
elsif Foreman.jruby? elsif Foreman.jruby_18?
require "posix/spawn" require "posix/spawn"
wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}" wrapped_command = "#{Foreman.runner} -d '#{cwd}' -p -- #{command}"
POSIX::Spawn.spawn env, wrapped_command, :out => output, :err => output POSIX::Spawn.spawn env, wrapped_command, :out => output, :err => output