Skip to content
Permalink
Browse files
Avoid failing with "module not found" for hugo mod init and similar
Fixes #8940
  • Loading branch information
bep committed Aug 31, 2021
1 parent 0fc2ce9 commit a0489c2dfd3ceb4d0702de0da7a4af3eabce05e5
Showing with 11 additions and 2 deletions.
  1. +6 −1 commands/commandeer.go
  2. +5 −1 hugolib/config.go
@@ -309,7 +309,12 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
doWithConfig)

if err != nil {
return err
// We should improve the error handling here,
// but with hugo mod init and similar there is a chicken and egg situation
// with modules already configured in config.toml, so ignore those errors.
if mustHaveConfigFile || !moduleNotFoundRe.MatchString(err.Error()) {
return err
}
} else if mustHaveConfigFile && len(configFiles) == 0 {
return hugolib.ErrNoConfigFile
}
@@ -151,7 +151,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
return nil
}

_, modulesConfigFiles, err := l.collectModules(modulesConfig, l.cfg, collectHook)
_, modulesConfigFiles, modulesCollectErr := l.collectModules(modulesConfig, l.cfg, collectHook)
if err != nil {
return l.cfg, configFiles, err
}
@@ -166,6 +166,10 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid
return l.cfg, configFiles, err
}

if err == nil {
err = modulesCollectErr
}

return l.cfg, configFiles, err
}

0 comments on commit a0489c2

Please sign in to comment.