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

helper/config: copy buildname/buildtype properly

This commit is contained in:
Mitchell Hashimoto 2015-06-30 10:42:55 -07:00
parent 8fd673ff9f
commit fd2d44c212
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helper/config/decode.go
View File

@ -42,6 +42,8 @@ func Decode(target interface{}, config *DecodeOpts, raws ...interface{}) error {
if config.InterpolateContext == nil { if config.InterpolateContext == nil {
config.InterpolateContext = ctx config.InterpolateContext = ctx
} else { } else {
config.InterpolateContext.BuildName = ctx.BuildName
config.InterpolateContext.BuildType = ctx.BuildType
config.InterpolateContext.TemplatePath = ctx.TemplatePath config.InterpolateContext.TemplatePath = ctx.TemplatePath
config.InterpolateContext.UserVariables = ctx.UserVariables config.InterpolateContext.UserVariables = ctx.UserVariables
} }

2
template/interpolate/funcs.go
View File

@ -71,7 +71,7 @@ func funcGenBuildName(ctx *Context) interface{} {
func funcGenBuildType(ctx *Context) interface{} { func funcGenBuildType(ctx *Context) interface{} {
return func() (string, error) { return func() (string, error) {
if ctx == nil || ctx.BuildType == "" { if ctx == nil || ctx.BuildType == "" {
return "", errors.New("build_name not available") return "", errors.New("build_type not available")
} }
return ctx.BuildType, nil return ctx.BuildType, nil