iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-09-27 02:04:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/hashicorp/packer into vsphere-tpl

Browse Source
This commit is contained in:
bugbuilder
2017-08-31 22:22:51 -03:00
parent f09a9c4653 0047de9b96
commit abc21406cb
19 changed files with 561 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files
post-processor/googlecompute-export/post-processor.go
+1 -8
View File
@@ -120,14 +120,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
}
// Run the steps.
if p.config.PackerDebug {
p.runner = &multistep.DebugRunner{
Steps: steps,
PauseFn: common.MultistepDebugFn(ui),
}
} else {
p.runner = &multistep.BasicRunner{Steps: steps}
}
p.runner = common.NewRunner(steps, p.config.PackerConfig, ui)
p.runner.Run(state)
}
post-processor/vagrant-cloud/post-processor.go
+1 -9
View File
@@ -164,15 +164,7 @@ func (p *PostProcessor) PostProcess(ui packer.Ui, artifact packer.Artifact) (pac
}
// Run the steps
if p.config.PackerDebug {
p.runner = &multistep.DebugRunner{
Steps: steps,
PauseFn: common.MultistepDebugFn(ui),
}
} else {
p.runner = &multistep.BasicRunner{Steps: steps}
}
p.runner = common.NewRunner(steps, p.config.PackerConfig, ui)
p.runner.Run(state)
// If there was an error, return that