dilim/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-08-04 23:20:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Now returning error and stopping installation

Browse Source
This commit is contained in:
scriptonist
2018-03-13 16:33:10 +05:30
parent 6cfaa4ebf2
commit 5311bf40a8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/engine/engine.go
View File

@@ -19,7 +19,6 @@ package engine
import (
"bytes"
"fmt"
"log"
"path"
"sort"
"strings"
@@ -197,7 +196,7 @@ func (e *Engine) alterFuncMap(t *template.Template) template.FuncMap {
}
// render takes a map of templates/values and renders them.
func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
func (e *Engine) render(tpls map[string]renderable) (rendered map[string]string, err error) {
// Basically, what we do here is start with an empty parent template and then
// build up a list of templates -- one for each file. Once all of the templates
// have been parsed, we loop through again and execute every template.
@@ -206,8 +205,8 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
// to share common blocks, but to make the entire thing feel like a file-based
// template engine.
defer func() {
if err := recover(); err != nil {
log.Printf("rendering template failed: %v\n", err)
if r := recover(); r != nil {
err = fmt.Errorf("rendering template failed: %v", r)
}
}()
t := template.New("gotpl")
@@ -247,7 +246,7 @@ func (e *Engine) render(tpls map[string]renderable) (map[string]string, error) {
}
}
rendered := make(map[string]string, len(files))
rendered = make(map[string]string, len(files))
var buf bytes.Buffer
for _, file := range files {
// Don't render partials. We don't care out the direct output of partials.