]> git.maquefel.me Git - brevno-suite/hugo/commitdiff
commands: Make hugo env respect --logLevel
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 21 Jun 2023 21:18:38 +0000 (23:18 +0200)
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Wed, 21 Jun 2023 21:18:38 +0000 (23:18 +0200)
Fixes #11145

commands/commandeer.go
commands/config.go
commands/env.go
commands/hugobuilder.go

index c2b26b5ecaa0d056904f783d50d291c312edba87..26bd25c0170e413d0258d1b929c5d0423b168833 100644 (file)
@@ -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 {
index fe20196aace1ab3292160cec69d387ddb72c72f8..9bf1c0961b5f97978f70ea8d2c6dfe4e17099b48 100644 (file)
@@ -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
                }
        }
index a6db551e9af9fb0bbb66575077032f39e3c9a1bb..0652deb8747bf579ddc37a0566e8fc263850cad3 100644 (file)
@@ -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)
index 60e558c70a6a7c5b0d48c95d6ce2298d9ac061b8..71992e409edabdd8c2d2abd2f22269ce17ab38bc 100644 (file)
@@ -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))