core: ignore capability error [GH-4684]

This commit is contained in:
Mitchell Hashimoto 2014-10-22 21:10:36 -07:00
parent 1e6259dd00
commit 4e9c82f364
2 changed files with 5 additions and 0 deletions

View File

@ -10,6 +10,8 @@ IMPROVEMENTS:
BUG FIXES:
- core: Fix cases where sometimes SSH connection would hang.
- core: On a graceful halt, force halt if capability "insert public key"
is missing. [GH-4684]
- commands/box: `--cert` flag works properly. [GH-4691]
- command/docker-logs: Won't crash if container is removed. [GH-3990]
- command/docker-run: Synced folders will be attached properly. [GH-3873]

View File

@ -59,6 +59,9 @@ module Vagrant
rescue Timeout::Error
# Don't worry about it, we catch the case later.
end
rescue Errors::GuestCapabilityNotFound
# This happens if insert_public_key is called on a guest that
# doesn't support it. This will block a destroy so we let it go.
rescue Errors::MachineGuestNotReady
env[:ui].detail(I18n.t("vagrant.actions.vm.halt.guest_not_ready"))
end