iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

packer/rpc: don't panic on failed Ui calls

This commit is contained in:
Mitchell Hashimoto 2013-08-23 14:39:59 -07:00
parent 9c5e5af289
commit 443ccc5306
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
communicator/ssh/communicator.go
View File

@ -160,7 +160,7 @@ func (c *comm) Upload(path string, input io.Reader) error {
return err
}
if _, err := io.Copy(w, input_memory); err != nil{
if _, err := io.Copy(w, input_memory); err != nil {
return err
}

9
packer/rpc/ui.go
View File

@ -2,6 +2,7 @@ package rpc
import (
"github.com/mitchellh/packer/packer"
"log"
"net/rpc"
)
@ -30,7 +31,7 @@ func (u *Ui) Ask(query string) (result string, err error) {
func (u *Ui) Error(message string) {
if err := u.client.Call("Ui.Error", message, new(interface{})); err != nil {
panic(err)
log.Printf("Error in Ui RPC call: %s", err)
}
}
@ -41,19 +42,19 @@ func (u *Ui) Machine(t string, args ...string) {
}
if err := u.client.Call("Ui.Machine", rpcArgs, new(interface{})); err != nil {
panic(err)
log.Printf("Error in Ui RPC call: %s", err)
}
}
func (u *Ui) Message(message string) {
if err := u.client.Call("Ui.Message", message, new(interface{})); err != nil {
panic(err)
log.Printf("Error in Ui RPC call: %s", err)
}
}
func (u *Ui) Say(message string) {
if err := u.client.Call("Ui.Say", message, new(interface{})); err != nil {
panic(err)
log.Printf("Error in Ui RPC call: %s", err)
}
}