From 8451cbf8542265c2e7872e9ef38c910b8a1a96a3 Mon Sep 17 00:00:00 2001 From: Brian Cain Date: Wed, 4 Apr 2018 16:48:16 -0700 Subject: [PATCH] Move up location of error message --- lib/vagrant/plugin/v2/trigger.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/vagrant/plugin/v2/trigger.rb b/lib/vagrant/plugin/v2/trigger.rb index 30b420a60..0e56fd4b2 100644 --- a/lib/vagrant/plugin/v2/trigger.rb +++ b/lib/vagrant/plugin/v2/trigger.rb @@ -227,12 +227,13 @@ module Vagrant begin prov.provision rescue Exception => e + @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail")) + if on_error == :halt @logger.debug("Trigger run encountered an error. Halting on error...") raise e else @logger.debug("Trigger run encountered an error. Continuing on anyway...") - @machine.ui.error(I18n.t("vagrant.errors.triggers_run_fail")) @machine.ui.error(e.message) end end