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

packer/plugin: fix nil deref during ctrl-c of provisioner

This commit is contained in:
Mitchell Hashimoto 2013-08-28 11:21:02 -07:00
parent 87f47ba6de
commit 332d666180
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,6 +1,8 @@
## 0.3.6 (unreleased) ## 0.3.6 (unreleased)
BUG FIXES:
* core: Fix possible panic when ctrl-C during provisioner run.
## 0.3.5 (August 28, 2013) ## 0.3.5 (August 28, 2013)

2
packer/plugin/provisioner.go
View File

@ -29,7 +29,7 @@ func (c *cmdProvisioner) Provision(ui packer.Ui, comm packer.Communicator) error
} }
func (c *cmdProvisioner) checkExit(p interface{}, cb func()) { func (c *cmdProvisioner) checkExit(p interface{}, cb func()) {
if c.client.Exited() { if c.client.Exited() && cb != nil {
cb() cb()
} else if p != nil && !Killed { } else if p != nil && !Killed {
log.Panic(p) log.Panic(p)