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

Merge pull request #4691 from blackbirdit/master 

Fix typo that prevents "vagrant box add --cert certfile -name foo URL" from working
This commit is contained in:
Mitchell Hashimoto 2014-10-22 20:33:02 -07:00
parent 2f24b196c4 855bda8c26
commit 8ea46dd13e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ module Vagrant
downloader_options[:ca_path] = env[:box_download_ca_path]
downloader_options[:continue] = true
downloader_options[:insecure] = env[:box_download_insecure]
downloader_options[:client_cert] = env[:box_client_cert]
downloader_options[:client_cert] = env[:box_download_client_cert]
downloader_options[:headers] = ["Accept: application/json"] if opts[:json]
downloader_options[:ui] = env[:ui] if opts[:ui]

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

@ -81,7 +81,7 @@ module Vagrant
box_url: machine.config.vm.box_url || machine.config.vm.box,
box_provider: box_formats,
box_version: machine.config.vm.box_version,
box_client_cert: box_download_client_cert,
box_download_client_cert: box_download_client_cert,
box_download_ca_cert: box_download_ca_cert,
box_download_ca_path: box_download_ca_path,
box_download_insecure: box_download_insecure,