Revert "core: can't add boxes from network shares [GH-3279]"
This reverts commit 41636a8a9c
.
Conflicts:
CHANGELOG.md
This commit is contained in:
parent
5c9939c4bd
commit
f2a2d93042
|
@ -41,12 +41,6 @@ module Vagrant
|
|||
# Expand the path and try to use that, if possible
|
||||
p = File.expand_path(URI.unescape(u.gsub(/^file:\/\//, "")))
|
||||
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)
|
||||
|
||||
u
|
||||
|
|
|
@ -236,10 +236,6 @@ module Vagrant
|
|||
error_key(:box_update_no_metadata)
|
||||
end
|
||||
|
||||
class BoxUrlIsNetworkShare < VagrantError
|
||||
error_key(:box_url_is_network_share)
|
||||
end
|
||||
|
||||
class BoxVerificationFailed < VagrantError
|
||||
error_key(:failed, "vagrant.actions.box.verify")
|
||||
end
|
||||
|
|
|
@ -545,13 +545,6 @@ en:
|
|||
directly instead of from a box catalog. Vagrant can only
|
||||
check the versions of boxes that were added from a catalog
|
||||
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: |-
|
||||
Vagrant's built-in bundler management mechanism is disabled because
|
||||
Vagrant is running in an external bundler environment. In these
|
||||
|
|
Loading…
Reference in New Issue