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

core: vagrant help no longer loads Vagrantfile

This commit is contained in:
Mitchell Hashimoto 2014-03-13 08:54:30 -07:00
parent 513efa6739
commit 1213b87679
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -22,6 +22,7 @@ BUG FIXES:
- core: Validation on forwarded ports to make sure they're between - core: Validation on forwarded ports to make sure they're between
0 and 65535. [GH-3187] 0 and 65535. [GH-3187]
- core: Downloads with user/password use the curl `-u` flag. [GH-3183] - core: Downloads with user/password use the curl `-u` flag. [GH-3183]
- core: `vagrant help` no longer loads the Vagrantfile. [GH-3180]
- guests/darwin: Fix an exception when configuring networks. [GH-3143] - guests/darwin: Fix an exception when configuring networks. [GH-3143]
- hosts/linux: Unusual sed delimiter to avoid conflicts. [GH-3167] - hosts/linux: Unusual sed delimiter to avoid conflicts. [GH-3167]
- providers/virtualbox: Make more internal interactions with VBoxManage - providers/virtualbox: Make more internal interactions with VBoxManage

4
bin/vagrant
View File

@ -31,6 +31,10 @@ argv.each do |arg|
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}" ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
end end
if arg == "help"
ENV["VAGRANT_VAGRANTFILE"] = "plugin_command_#{Time.now.to_i}"
end
break break
end end
end end