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

core: can add box with name of directory [GH-3732]

This commit is contained in:
Mitchell Hashimoto 2014-05-09 09:24:29 -07:00
parent 39eaaf3664
commit 190ba4cd27
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -17,6 +17,8 @@ BUG FIXES:
- core: Hostnames can be one character. [GH-3713] - core: Hostnames can be one character. [GH-3713]
- core: Don't lock machines on SSH actions. [GH-3664] - core: Don't lock machines on SSH actions. [GH-3664]
- core: Fixed crash when adding a box from Vagrant Cloud that was the
same name as a real directory. [GH-3732]
- provisioners/shell: Fix shell provisioner config validation when the - provisioners/shell: Fix shell provisioner config validation when the
`binary` option is set to false [GH-3712] `binary` option is set to false [GH-3712]
- providers/docker: default proxy VM won't use HGFS [GH-3687] - providers/docker: default proxy VM won't use HGFS [GH-3687]

2
lib/vagrant/action/builtin/box_add.rb
View File

@ -476,6 +476,8 @@ module Vagrant
# Actually not sure what causes this, but its always # Actually not sure what causes this, but its always
# in a case that isn't true. # in a case that isn't true.
return false return false
rescue Errno::EISDIR
return false
rescue Errno::ENOENT rescue Errno::ENOENT
return false return false
end end