Cleanup some debug code and reorganize config struct

This commit is contained in:
Chris Bednarski 2015-06-18 14:01:00 -07:00
parent f06847ff10
commit 0880d448f0
1 changed files with 11 additions and 10 deletions

View File

@ -21,13 +21,17 @@ import (
type Config struct {
common.PackerConfig `mapstructure:",squash"`
OutputPath string `mapstructure:"output"`
CompressionLevel int `mapstructure:"compression_level"`
KeepInputArtifact bool `mapstructure:"keep_input_artifact"`
Archive string
Algorithm string
UsingDefault bool
ctx *interpolate.Context
// Fields from config file
OutputPath string `mapstructure:"output"`
CompressionLevel int `mapstructure:"compression_level"`
KeepInputArtifact bool `mapstructure:"keep_input_artifact"`
// Derived fields
Archive string
Algorithm string
ctx *interpolate.Context
}
type PostProcessor struct {
@ -54,8 +58,6 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
},
}, raws...)
fmt.Printf("CompressionLevel: %d\n", p.config.CompressionLevel)
errs := new(packer.MultiError)
if p.config.OutputPath == "" {
@ -81,7 +83,6 @@ func (p *PostProcessor) Configure(raws ...interface{}) error {
p.config.CompressionLevel = pgzip.DefaultCompression
}
fmt.Printf("CompressionLevel: %d\n", p.config.CompressionLevel)
for key, ptr := range templates {
if *ptr == "" {
errs = packer.MultiErrorAppend(