mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-09-01 22:42:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

modules: Fix "hugo mod get -u" with no arguments

Browse Source 
Fixes #6826
Closes #6825
This commit is contained in:
Bjørn Erik Pedersen
2020-01-30 09:08:49 +01:00
parent 8f08cdd0ac
commit 49ef647203
4 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
hugolib/config.go
View File

@@ -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
}