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

Fix possibility of options being nil in SSH class

This commit is contained in:
Mitchell Hashimoto 2011-01-24 20:46:22 -08:00
parent afcbeb9e7b
commit 5a2dc84fca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/ssh/session.rb
View File

@ -55,8 +55,6 @@ module Vagrant
# the actual `exec!` implementation, except that this # the actual `exec!` implementation, except that this
# implementation also reports `:exit_status` to the block if given. # implementation also reports `:exit_status` to the block if given.
def exec!(command, options=nil, &block) def exec!(command, options=nil, &block)
options = { :error_check => true }.merge(options || {})
retryable(:tries => 5, :on => IOError, :sleep => 0.5) do retryable(:tries => 5, :on => IOError, :sleep => 0.5) do
metach = session.open_channel do |channel| metach = session.open_channel do |channel|
channel.exec(command) do |ch, success| channel.exec(command) do |ch, success|
@ -73,6 +71,8 @@ module Vagrant
# Sets up the channel callbacks to properly check exit statuses and # Sets up the channel callbacks to properly check exit statuses and
# callback on stdout/stderr. # callback on stdout/stderr.
def setup_channel_callbacks(channel, command, options, block) def setup_channel_callbacks(channel, command, options, block)
options = { :error_check => true }.merge(options || {})
block ||= Proc.new do |ch, type, data| block ||= Proc.new do |ch, type, data|
check_exit_status(data, command, options) if type == :exit_status && options[:error_check] check_exit_status(data, command, options) if type == :exit_status && options[:error_check]