diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-03-25 14:37:04 +0100 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-03-27 15:43:56 +0200 |
| commit | 15b64d51da48807c5f896f17b33d8c0d054c9461 (patch) | |
| tree | b8f585ad5a1741b26540184ec29ec2a26fc4060f /hugolib | |
| parent | 148fedd227b8f4f5af8f72cb6841653140f82dfe (diff) | |
all: Propagate baseURL error to the callers
Diffstat (limited to 'hugolib')
| -rw-r--r-- | hugolib/hugo_sites.go | 8 | ||||
| -rw-r--r-- | hugolib/testhelpers_test.go | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index d0ad57525..6c737f65a 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -92,7 +92,13 @@ func applyDepsIfNeeded(cfg deps.DepsCfg, sites ...*Site) error { if d == nil { cfg.Language = s.Language cfg.WithTemplate = s.withSiteTemplates(cfg.WithTemplate) - d = deps.New(cfg) + + var err error + d, err = deps.New(cfg) + if err != nil { + return err + } + s.Deps = d if err = d.LoadResources(); err != nil { diff --git a/hugolib/testhelpers_test.go b/hugolib/testhelpers_test.go index 1caa97e4e..d50514529 100644 --- a/hugolib/testhelpers_test.go +++ b/hugolib/testhelpers_test.go @@ -74,7 +74,8 @@ func (th testHelper) replaceDefaultContentLanguageValue(value string) string { func newTestPathSpec(fs *hugofs.Fs, v *viper.Viper) *helpers.PathSpec { l := helpers.NewDefaultLanguage(v) - return helpers.NewPathSpec(fs, l) + ps, _ := helpers.NewPathSpec(fs, l) + return ps } func newTestDefaultPathSpec() *helpers.PathSpec { @@ -82,7 +83,8 @@ func newTestDefaultPathSpec() *helpers.PathSpec { // Easier to reason about in tests. v.Set("disablePathToLower", true) fs := hugofs.NewDefault(v) - return helpers.NewPathSpec(fs, v) + ps, _ := helpers.NewPathSpec(fs, v) + return ps } func newTestCfg() (*viper.Viper, *hugofs.Fs) { |