From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 31 Aug 2021 10:08:11 +0000 (+0200)
Subject: Avoid failing with "module not found" for hugo mod init and similar
X-Git-Tag: v0.88.0~11
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a0489c2dfd3ceb4d0702de0da7a4af3eabce05e5;p=brevno-suite%2Fhugo

Avoid failing with "module not found" for hugo mod init and similar

Fixes #8940
---

diff --git a/commands/commandeer.go b/commands/commandeer.go
index bac96fa7..b2a995ae 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.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
 	}
diff --git a/hugolib/config.go b/hugolib/config.go
index aa9c8110..cdce19d6 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -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
 }