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

command/build, command/validate: Setup proper components to avoid nil

This commit is contained in:
Mitchell Hashimoto 2013-06-18 16:29:29 -07:00
parent 0edeb49467
commit 338298b8af
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
command/build/command.go
View File

@ -63,9 +63,10 @@ func (c Command) Run(env packer.Environment, args []string) int {
// The component finder for our builds // The component finder for our builds
components := &packer.ComponentFinder{ components := &packer.ComponentFinder{
Builder: env.Builder, Builder: env.Builder,
Hook: env.Hook, Hook: env.Hook,
Provisioner: env.Provisioner, PostProcessor: env.PostProcessor,
Provisioner: env.Provisioner,
} }
// Go through each builder and compile the builds that we care about // Go through each builder and compile the builds that we care about

7
command/validate/commang.go
View File

@ -56,9 +56,10 @@ func (c Command) Run(env packer.Environment, args []string) int {
// The component finder for our builds // The component finder for our builds
components := &packer.ComponentFinder{ components := &packer.ComponentFinder{
Builder: env.Builder, Builder: env.Builder,
Hook: env.Hook, Hook: env.Hook,
Provisioner: env.Provisioner, PostProcessor: env.PostProcessor,
Provisioner: env.Provisioner,
} }
// Otherwise, get all the builds // Otherwise, get all the builds

4
packer/rpc/post_processor.go
View File

@ -18,7 +18,7 @@ type PostProcessorServer struct {
} }
type PostProcessorProcessResponse struct { type PostProcessorProcessResponse struct {
Err error Err error
RPCAddress string RPCAddress string
} }
@ -83,7 +83,7 @@ func (p *PostProcessorServer) PostProcess(address string, reply *PostProcessorPr
} }
*reply = PostProcessorProcessResponse{ *reply = PostProcessorProcessResponse{
Err: err, Err: err,
RPCAddress: responseAddress, RPCAddress: responseAddress,
} }