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

Revert "core: can't add boxes from network shares [GH-3279]" 

This reverts commit 41636a8a9c.

Conflicts:
	CHANGELOG.md
This commit is contained in:
Mitchell Hashimoto 2014-04-24 22:50:27 -07:00
parent 5c9939c4bd
commit f2a2d93042
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,12 +41,6 @@ module Vagrant
# Expand the path and try to use that, if possible # Expand the path and try to use that, if possible
p = File.expand_path(URI.unescape(u.gsub(/^file:\/\//, ""))) p = File.expand_path(URI.unescape(u.gsub(/^file:\/\//, "")))
p = Util::Platform.cygwin_windows_path(p) p = Util::Platform.cygwin_windows_path(p)
# If this is a network share on Windows then show the user an error
if Util::Platform.windows? && (p.start_with?("//") || p.start_with?("\\\\"))
raise Errors::BoxUrlIsNetworkShare, url: p
end
next "file://#{URI.escape(p.gsub("\\", "/"))}" if File.file?(p) next "file://#{URI.escape(p.gsub("\\", "/"))}" if File.file?(p)
u u

4
lib/vagrant/errors.rb
View File

@ -236,10 +236,6 @@ module Vagrant
error_key(:box_update_no_metadata) error_key(:box_update_no_metadata)
end end
class BoxUrlIsNetworkShare < VagrantError
error_key(:box_url_is_network_share)
end
class BoxVerificationFailed < VagrantError class BoxVerificationFailed < VagrantError
error_key(:failed, "vagrant.actions.box.verify") error_key(:failed, "vagrant.actions.box.verify")
end end

7
templates/locales/en.yml
View File

@ -545,13 +545,6 @@ en:
directly instead of from a box catalog. Vagrant can only directly instead of from a box catalog. Vagrant can only
check the versions of boxes that were added from a catalog check the versions of boxes that were added from a catalog
such as from the public Vagrant Server. such as from the public Vagrant Server.
box_url_is_network_share: |-
You specified a network share path as a path to add a box. Vagrant
current doesn't support network share URLs. Please copy the file
from the network share to your local machine, then add it from
there.
URL: %{url}
bundler_disabled: |- bundler_disabled: |-
Vagrant's built-in bundler management mechanism is disabled because Vagrant's built-in bundler management mechanism is disabled because
Vagrant is running in an external bundler environment. In these Vagrant is running in an external bundler environment. In these