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

Fix broken variable references

This commit is contained in:
Max Lincoln 2014-07-23 14:56:49 -04:00
parent 072bb26a30
commit 02f4adc895
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/communicators/winrm/shell.rb
View File

@ -81,7 +81,7 @@ module VagrantPlugins
end end
def execute_shell_with_retry(command, shell, &block) def execute_shell_with_retry(command, shell, &block)
retryable(tries: @max_tries, on: @@exceptions_to_retry_on, sleep: 10) do retryable(tries: @config.max_tries, on: @@exceptions_to_retry_on, sleep: 10) do
@logger.debug("#{shell} executing:\n#{command}") @logger.debug("#{shell} executing:\n#{command}")
output = session.send(shell, command) do |out, err| output = session.send(shell, command) do |out, err|
block.call(:stdout, out) if block_given? && out block.call(:stdout, out) if block_given? && out
@ -96,8 +96,8 @@ module VagrantPlugins
# If the error is a 401, we can return a more specific error message # If the error is a 401, we can return a more specific error message
if winrm_exception.message.include?("401") if winrm_exception.message.include?("401")
raise Errors::AuthError, raise Errors::AuthError,
user: @username, user: @config.username,
password: @password, password: @config.password,
endpoint: endpoint, endpoint: endpoint,
message: winrm_exception.message message: winrm_exception.message
end end
@ -126,7 +126,7 @@ module VagrantPlugins
end end
def endpoint def endpoint
case @config.transport case @config.transport.to_sym
when :ssl when :ssl
"https://#{@host}:#{@port}/wsman" "https://#{@host}:#{@port}/wsman"
when :plaintext when :plaintext