diff --git a/lib/vagrant-lxc/errors.rb b/lib/vagrant-lxc/errors.rb index 1651d5d..5190a20 100644 --- a/lib/vagrant-lxc/errors.rb +++ b/lib/vagrant-lxc/errors.rb @@ -16,6 +16,15 @@ module Vagrant end end + # Raised when user interrupts a subprocess + class SubprocessInterruptError < Vagrant::Errors::VagrantError + error_key(:lxc_interrupt_error) + def initialize(message, *args) + super + end + end + + class NamespacesNotSupported < Vagrant::Errors::VagrantError end diff --git a/lib/vagrant-lxc/sudo_wrapper.rb b/lib/vagrant-lxc/sudo_wrapper.rb index 925e53a..600f060 100644 --- a/lib/vagrant-lxc/sudo_wrapper.rb +++ b/lib/vagrant-lxc/sudo_wrapper.rb @@ -59,7 +59,7 @@ module Vagrant # nicely handled by Vagrant. if r.exit_code != 0 if @interrupted - @logger.info("Exit code != 0, but interrupted. Ignoring.") + raise LXC::Errors::SubprocessInterruptError, command.inspect else raise LXC::Errors::ExecuteError, command: command.inspect, stderr: r.stderr, stdout: r.stdout, exitcode: r.exit_code diff --git a/locales/en.yml b/locales/en.yml index 8b61c36..4cec56d 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -40,6 +40,9 @@ en: preparing: Setting up mount entries for shared folders... errors: + lxc_interrupt_error: |- + Interrupted + lxc_execute_error: |- There was an error executing %{command}