From 43298f028ccdf38e949b573d03d328bf96b998a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Tue, 3 Sep 2019 12:58:02 +0200 Subject: Make the "is this a Hugo Module" logic more lenient Now we only try to load modules via Go if there is one or more modules imported in project config. Fixes #6299 --- modules/collect.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'modules/collect.go') diff --git a/modules/collect.go b/modules/collect.go index 24b80a1d7..731a991b8 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -250,8 +250,7 @@ func (c *collector) add(owner *moduleAdapter, moduleImport Import, disabled bool } if moduleDir == "" { - - if c.GoModulesFilename != "" && c.isProbablyModule(modulePath) { + if c.GoModulesFilename != "" && isProbablyModule(modulePath) { // Try to "go get" it and reload the module configuration. if err := c.Get(modulePath); err != nil { return nil, err @@ -301,10 +300,6 @@ func (c *collector) add(owner *moduleAdapter, moduleImport Import, disabled bool ma.path = modulePath } - if err := ma.validateAndApplyDefaults(c.fs); err != nil { - return nil, err - } - if !moduleImport.IgnoreConfig { if err := c.applyThemeConfig(ma); err != nil { return nil, err -- cgit v1.2.3