From 14517e6fa5455fece7e968ac0fe7781111284dad Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Fri, 23 Aug 2013 15:58:30 -0700 Subject: [PATCH] provisioner/salt-masterless: fix the build --- provisioner/salt-masterless/provisioner.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/provisioner/salt-masterless/provisioner.go b/provisioner/salt-masterless/provisioner.go index bc98b5e37..cc47ba667 100644 --- a/provisioner/salt-masterless/provisioner.go +++ b/provisioner/salt-masterless/provisioner.go @@ -108,6 +108,7 @@ func (p *Provisioner) Provision(ui packer.Ui, comm packer.Communicator) error { } if p.config.MinionConfig != "" { + ui.Message(fmt.Sprintf("Uploading minion config: %s", p.config.MinionConfig)) err := uploadMinionConfig(comm, "/etc/salt/minion", p.config.MinionConfig) if err != nil { return err @@ -195,7 +196,6 @@ func UploadLocalDirectory(localDir string, remoteDir string, comm packer.Communi } func uploadMinionConfig(comm packer.Communicator, dst string, src string) error { - ui.Message(fmt.Sprintf("Uploading minion config: %s", src)) f, err := os.Open(src) if err != nil { return fmt.Errorf("Error opening minion config: %s", err) @@ -205,4 +205,6 @@ func uploadMinionConfig(comm packer.Communicator, dst string, src string) error if err = comm.Upload(dst, f); err != nil { return fmt.Errorf("Error uploading minion config: %s", err) } + + return nil }