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

Merge pull request #5604 from bluehaoran/patch-1 

Update ssh.rb to detect PLink v0.64
This commit is contained in:
Seth Vargo 2015-05-30 11:51:52 -07:00
parent f6ef5e4804 0962a2d151
commit 98a23c5a5e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/util/ssh.rb
View File

@ -83,7 +83,7 @@ module Vagrant
# underneath the covers. In this case, we tell the user. # underneath the covers. In this case, we tell the user.
if Platform.windows? if Platform.windows?
r = Subprocess.execute(ssh_path) r = Subprocess.execute(ssh_path)
if r.stdout.include?("PuTTY Link") if r.stdout.include?("PuTTY Link") || r.stdout.include?("Plink: command-line connection utility")
raise Errors::SSHIsPuttyLink, raise Errors::SSHIsPuttyLink,
host: ssh_info[:host], host: ssh_info[:host],
port: ssh_info[:port], port: ssh_info[:port],