From ca54df1a763a328f357b2e5b3ab37fdc27ced725 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 11 Aug 2013 19:08:08 -0700 Subject: [PATCH] packer: TargettedUi properly targets machine-readable data --- packer/ui.go | 4 ++-- packer/ui_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packer/ui.go b/packer/ui.go index b2b10293a..db521bfa1 100644 --- a/packer/ui.go +++ b/packer/ui.go @@ -140,8 +140,8 @@ func (u *TargettedUi) Error(message string) { } func (u *TargettedUi) Machine(t string, args ...string) { - // Just pass it through for now. - u.Ui.Machine(t, args...) + // Prefix in the target, then pass through + u.Ui.Machine(fmt.Sprintf("%s,%s", u.Target, t), args...) } func (u *TargettedUi) prefixLines(arrow bool, message string) string { diff --git a/packer/ui_test.go b/packer/ui_test.go index b5cb0f345..a9ce5dc26 100644 --- a/packer/ui_test.go +++ b/packer/ui_test.go @@ -41,21 +41,21 @@ func TestTargettedUi(t *testing.T) { assert := asserts.NewTestingAsserts(t, true) bufferUi := testUi() - TargettedUi := &TargettedUi{ + targettedUi := &TargettedUi{ Target: "foo", Ui: bufferUi, } - TargettedUi.Say("foo") + targettedUi.Say("foo") assert.Equal(readWriter(bufferUi), "==> foo: foo\n", "should have prefix") - TargettedUi.Message("foo") + targettedUi.Message("foo") assert.Equal(readWriter(bufferUi), " foo: foo\n", "should have prefix") - TargettedUi.Error("bar") + targettedUi.Error("bar") assert.Equal(readWriter(bufferUi), "==> foo: bar\n", "should have prefix") - TargettedUi.Say("foo\nbar") + targettedUi.Say("foo\nbar") assert.Equal(readWriter(bufferUi), "==> foo: foo\n==> foo: bar\n", "should multiline") }