From cee517d96369f0bb1d71ee5080d4638a0b5a76e6 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Tue, 1 Dec 2015 16:59:06 -0800
Subject: [PATCH] core: fix machine readable UI to contain target and have
 proper format

---
 lib/vagrant/ui.rb | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb
index 384bb7667..bae5ca3d1 100644
--- a/lib/vagrant/ui.rb
+++ b/lib/vagrant/ui.rb
@@ -104,8 +104,8 @@ module Vagrant
       end
 
       [:detail, :warn, :error, :info, :output, :success].each do |method|
-        define_method(method) do |message, *opts|
-          machine("ui", method.to_s, message)
+        define_method(method) do |message, *args, **opts|
+          machine("ui", method.to_s, message, *args, **opts)
         end
       end
 
@@ -280,6 +280,8 @@ module Vagrant
               opts[:bold] = #{method.inspect} != :detail && \
                 #{method.inspect} != :ask
             end
+
+            opts[:target] = @prefix
             @ui.#{method}(format_message(#{method.inspect}, message, **opts), *args, **opts)
           end
         CODE
@@ -324,17 +326,11 @@ module Vagrant
         target = opts[:target] if opts.key?(:target)
         target = "#{target}:" if target != ""
 
-
-
         # Get the lines. The first default is because if the message
         # is an empty string, then we want to still use the empty string.
         lines = [message]
         lines = message.split("\n") if message != ""
 
-        if @ui.is_a?(Vagrant::UI::MachineReadable)
-          return machine(type, message, { :target => target })
-        end
-
         # Otherwise, make sure to prefix every line properly
         lines.map do |line|
           "#{prefix}#{target} #{line}"