haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fork-and-wait on Tiger as well as leopard. [related to GH-51]

This commit is contained in:
Mitchell Hashimoto 2010-09-07 14:19:06 -07:00
parent 73c223c885
commit 337eec2d07
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/ssh.rb
View File

@ -42,7 +42,7 @@ module Vagrant
# (GH-51). As a workaround, we fork and wait. On all other platforms, # (GH-51). As a workaround, we fork and wait. On all other platforms,
# we simply exec. # we simply exec.
pid = nil pid = nil
pid = fork if Util::Platform.leopard? pid = fork if Util::Platform.leopard? || Util::Platform.tiger?
Kernel.exec "ssh #{command_options.join(" ")} #{options[:username]}@#{options[:host]}".strip if pid.nil? Kernel.exec "ssh #{command_options.join(" ")} #{options[:username]}@#{options[:host]}".strip if pid.nil?
Process.wait(pid) if pid Process.wait(pid) if pid
end end

6
lib/vagrant/util/platform.rb
View File

@ -5,8 +5,12 @@ module Vagrant
# This class just contains some platform checking code. # This class just contains some platform checking code.
class Platform class Platform
class << self class << self
def tiger?
platform.include?("darwin8")
end
def leopard? def leopard?
RUBY_PLATFORM.downcase.include?("darwin9") platform.include?("darwin9")
end end
[:darwin, :bsd, :linux].each do |type| [:darwin, :bsd, :linux].each do |type|