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

packer/rpc: don't reply with arbitrary error

Browse Source
This commit is contained in:
Mitchell Hashimoto 2014-04-28 21:36:49 -07:00
parent 8cdd784e46
commit 3ac246d611
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packer/rpc/provisioner.go
View File

@ -26,7 +26,7 @@ type ProvisionerPrepareArgs struct {
func (p *provisioner) Prepare(configs ...interface{}) (err error) {
args := &ProvisionerPrepareArgs{configs}
if cerr := p.client.Call("Provisioner.Prepare", args, &err); cerr != nil {
if cerr := p.client.Call("Provisioner.Prepare", args, new(interface{})); cerr != nil {
err = cerr
}
@ -50,13 +50,8 @@ func (p *provisioner) Cancel() {
}
}
func (p *ProvisionerServer) Prepare(args *ProvisionerPrepareArgs, reply *error) error {
*reply = p.p.Prepare(args.Configs...)
if *reply != nil {
*reply = NewBasicError(*reply)
}
return nil
func (p *ProvisionerServer) Prepare(args *ProvisionerPrepareArgs, reply *interface{}) error {
return p.p.Prepare(args.Configs...)
}
func (p *ProvisionerServer) Provision(streamId uint32, reply *interface{}) error {