diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-13 17:15:52 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-13 18:09:11 +0200 |
| commit | 6315098104ff80f8be6d5ae812835b4b4079582e (patch) | |
| tree | be7892194e6fb05517982cbcfffc34c1e06bb89a | |
| parent | b64617fe4f90da030bcf4a9c5a4913393ce96b14 (diff) | |
modules: Do not fail build on errors in theme.toml
Fixes #6162
| -rw-r--r-- | hugolib/hugo_modules_test.go | 11 | ||||
| -rw-r--r-- | modules/collect.go | 5 |
2 files changed, 12 insertions, 4 deletions
diff --git a/hugolib/hugo_modules_test.go b/hugolib/hugo_modules_test.go index 58244049e..826f5f1e5 100644 --- a/hugolib/hugo_modules_test.go +++ b/hugolib/hugo_modules_test.go @@ -349,7 +349,8 @@ path="ok" path="incompat1" [[module.imports]] path="incompat2" - +[[module.imports]] +path="incompat3" `) @@ -370,6 +371,12 @@ min_version = "5.0.0" `) + // Issue 6162 + b.WithSourceFile("themes/incompat3/theme.toml", ` +min_version = 0.55.0 + +`) + logger := loggers.NewWarningLogger() b.WithLogger(logger) @@ -377,7 +384,7 @@ min_version = "5.0.0" c := qt.New(t) - c.Assert(logger.WarnCounter.Count(), qt.Equals, uint64(2)) + c.Assert(logger.WarnCounter.Count(), qt.Equals, uint64(3)) } diff --git a/modules/collect.go b/modules/collect.go index 9a18f5579..87f2720c1 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -412,9 +412,10 @@ func (c *collector) applyThemeConfig(tc *moduleAdapter) error { } themeCfg, err = metadecoders.Default.UnmarshalToMap(data, metadecoders.TOML) if err != nil { - return errors.Wrapf(err, "failed to read module config for %q in %q", tc.Path(), themeTOML) + c.logger.WARN.Printf("Failed to read module config for %q in %q: %s", tc.Path(), themeTOML, err) + } else { + maps.ToLower(themeCfg) } - maps.ToLower(themeCfg) } if hasConfig { |