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

core: Vagrantfile must be file [GH-2216]

This commit is contained in:
Mitchell Hashimoto 2013-09-17 12:42:57 -07:00
parent 8cc5b4ddb5
commit cac28c82de
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

@ -19,6 +19,8 @@ BUG FIXES:
works. [GH-2196] works. [GH-2196]
- core: Don't try to be clever about deleting the machine state - core: Don't try to be clever about deleting the machine state
directory anymore. Manually done in destroy actions. [GH-2201] directory anymore. Manually done in destroy actions. [GH-2201]
- core: Find the root Vagrantfile only if Vagrantfile is a file, not
a directory. [GH-2216]
- guests/linux: Try `id -g` in addition to `getent` for mounting - guests/linux: Try `id -g` in addition to `getent` for mounting
VirtualBox shared folders [GH-2197] VirtualBox shared folders [GH-2197]
- hosts/arch: NFS exporting works properly, no exceptions. [GH-2161] - hosts/arch: NFS exporting works properly, no exceptions. [GH-2161]

2
lib/vagrant/environment.rb
View File

@ -709,7 +709,7 @@ module Vagrant
filenames ||= ["Vagrantfile", "vagrantfile"] filenames ||= ["Vagrantfile", "vagrantfile"]
filenames.each do |vagrantfile| filenames.each do |vagrantfile|
current_path = search_path.join(vagrantfile) current_path = search_path.join(vagrantfile)
return current_path if current_path.exist? return current_path if current_path.file?
end end
nil nil