diff options
Diffstat (limited to 'context/context.go')
| -rw-r--r-- | context/context.go | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/context/context.go b/context/context.go index a6d181e7bc2b..9996f31faa5f 100644 --- a/context/context.go +++ b/context/context.go @@ -10,9 +10,9 @@ package context import ( + "fmt" "path" - "github.com/polydawn/meep" "github.com/tazjin/kontemplate/util" ) @@ -51,9 +51,8 @@ type Context struct { BaseDir string } -type ContextLoadingError struct { - meep.AllTraits - Filename string +func contextLoadingError(filename string, cause error) error { + return fmt.Errorf("Context loading failed on file %s due to: \n%v", filename, cause) } // Attempt to load and deserialise a Context from the specified file. @@ -62,10 +61,7 @@ func LoadContextFromFile(filename string) (*Context, error) { err := util.LoadJsonOrYaml(filename, &c) if err != nil { - return nil, meep.New( - &ContextLoadingError{Filename: filename}, - meep.Cause(err), - ) + return nil, contextLoadingError(filename, err) } c.ResourceSets = flattenPrepareResourceSetPaths(&c.ResourceSets) @@ -74,10 +70,7 @@ func LoadContextFromFile(filename string) (*Context, error) { err = c.loadImportedVariables() if err != nil { - return nil, meep.New( - &ContextLoadingError{Filename: filename}, - meep.Cause(err), - ) + return nil, contextLoadingError(filename, err) } return &c, nil |