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

ssh-config doesn't raise exception when VB machine not created [GH-1562]

This commit is contained in:
Mitchell Hashimoto 2013-04-09 08:47:52 -07:00
parent 41d6553a5d
commit c1f53a4ace
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -75,6 +75,8 @@ BUG FIXES:
environments. [GH-1545] environments. [GH-1545]
- Networks come back up properly on RedHat systems after reboot. [GH-921] - Networks come back up properly on RedHat systems after reboot. [GH-921]
- `config.ssh` settings override all detected SSH settings (regression). [GH-1479] - `config.ssh` settings override all detected SSH settings (regression). [GH-1479]
- `ssh-config` won't raise an exception if the VirtualBox machine
is not created. [GH-1562]
## 1.1.6 (April 3, 2013) ## 1.1.6 (April 3, 2013)

2
plugins/providers/virtualbox/provider.rb
View File

@ -45,7 +45,7 @@ module VagrantPlugins
def ssh_info def ssh_info
# If the VM is not created then we cannot possibly SSH into it, so # If the VM is not created then we cannot possibly SSH into it, so
# we return nil. # we return nil.
return nil if state == :not_created return nil if state.id == :not_created
# Return what we know. The host is always "127.0.0.1" because # Return what we know. The host is always "127.0.0.1" because
# VirtualBox VMs are always local. The port we try to discover # VirtualBox VMs are always local. The port we try to discover