commands: Make hugo env respect --logLevel

Fixes #11145
gohugoio · Jun 21, 2023 · b1016d2 · b1016d2
1 parent 49336bf
commit b1016d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/commands/commandeer.go b/commands/commandeer.go
@@ -136,6 +136,10 @@ type rootCommand struct {
 	cfgDir  string
 }
 
+func (r *rootCommand) isVerbose() bool {
+	return r.logger.Level() <= logg.LevelInfo
+}
+
 func (r *rootCommand) Build(cd *simplecobra.Commandeer, bcfg hugolib.BuildCfg, cfg config.Provider) (*hugolib.HugoSites, error) {
 	h, err := r.Hugo(cfg)
 	if err != nil {

diff --git a/commands/config.go b/commands/config.go
@@ -212,7 +212,7 @@ func (c *configMountsCommand) Run(ctx context.Context, cd *simplecobra.Commandee
 	}
 
 	for _, m := range conf.configs.Modules {
-		if err := parser.InterfaceToConfig(&configModMounts{m: m, verbose: r.verbose}, metadecoders.JSON, os.Stdout); err != nil {
+		if err := parser.InterfaceToConfig(&configModMounts{m: m, verbose: r.isVerbose()}, metadecoders.JSON, os.Stdout); err != nil {
 			return err
 		}
 	}

diff --git a/commands/env.go b/commands/env.go
@@ -32,7 +32,7 @@ func newEnvCommand() simplecobra.Commander {
 			r.Printf("GOARCH=%q\n", runtime.GOARCH)
 			r.Printf("GOVERSION=%q\n", runtime.Version())
 
-			if r.verbose {
+			if r.isVerbose() {
 				deps := hugo.GetDependencyList()
 				for _, dep := range deps {
 					r.Printf("%s\n", dep)

diff --git a/commands/hugobuilder.go b/commands/hugobuilder.go
@@ -1012,7 +1012,7 @@ func (c *hugoBuilder) loadConfig(cd *simplecobra.Commandeer, running bool) error
 	cfg.Set("internal", maps.Params{
 		"running": running,
 		"watch":   watch,
-		"verbose": c.r.verbose,
+		"verbose": c.r.isVerbose(),
 	})
 
 	conf, err := c.r.ConfigFromProvider(c.r.configVersionID.Load(), flagsToCfg(cd, cfg))