diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-01-30 09:08:49 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2020-01-30 17:15:35 +0100 |
commit | 49ef6472039ede7d485242eba511207a8274495a (patch) | |
tree | aa7c974699598c6aa649237028ccf2529e15fa9e /hugolib/config.go | |
parent | 8f08cdd0ac6a2decd5aa5c9c12c0b2c264f9a989 (diff) |
modules: Fix "hugo mod get -u" with no arguments
Fixes #6826
Closes #6825
Diffstat (limited to 'hugolib/config.go')
-rw-r--r-- | hugolib/config.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/hugolib/config.go b/hugolib/config.go index e29d6ac9f..841bd5193 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -225,15 +225,12 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid } _, modulesConfigFiles, err := l.collectModules(modulesConfig, v, collectHook) - if err != nil { - return v, configFiles, err - } - if len(modulesConfigFiles) > 0 { + if err == nil && len(modulesConfigFiles) > 0 { configFiles = append(configFiles, modulesConfigFiles...) } - return v, configFiles, nil + return v, configFiles, err } @@ -465,9 +462,6 @@ func (l configLoader) collectModules(modConfig modules.Config, v1 *viper.Viper, v1.Set("modulesClient", modulesClient) moduleConfig, err := modulesClient.Collect() - if err != nil { - return nil, nil, err - } // Avoid recreating these later. v1.Set("allModules", moduleConfig.ActiveModules) @@ -478,7 +472,7 @@ func (l configLoader) collectModules(modConfig modules.Config, v1 *viper.Viper, configFilenames = append(configFilenames, moduleConfig.GoModulesFilename) } - return moduleConfig.ActiveModules, configFilenames, nil + return moduleConfig.ActiveModules, configFilenames, err } |