Skip to content

Commit

Permalink
Revert "core: can't add boxes from network shares [GH-3279]"
Browse files Browse the repository at this point in the history
This reverts commit 41636a8.

Conflicts:
	CHANGELOG.md
  • Loading branch information
mitchellh committed Apr 25, 2014
1 parent 5c9939c commit f2a2d93
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 17 deletions.
6 changes: 0 additions & 6 deletions lib/vagrant/action/builtin/box_add.rb
Expand Up @@ -41,12 +41,6 @@ def call(env)
# 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
Expand Down
4 changes: 0 additions & 4 deletions lib/vagrant/errors.rb
Expand Up @@ -236,10 +236,6 @@ class BoxUpdateNoMetadata < VagrantError
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
Expand Down
7 changes: 0 additions & 7 deletions templates/locales/en.yml
Expand Up @@ -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
Expand Down

0 comments on commit f2a2d93

Please sign in to comment.