github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

commands: Make hugo env respect --logLevel

Browse source 
Fixes #11145
This commit is contained in:
Bjørn Erik Pedersen 2023-06-21 23:18:38 +02:00
parent 49336bfc58
commit b1016d2e26
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
commands/commandeer.go
View file

@ -136,6 +136,10 @@ type rootCommand struct {
cfgDir string 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) { func (r *rootCommand) Build(cd *simplecobra.Commandeer, bcfg hugolib.BuildCfg, cfg config.Provider) (*hugolib.HugoSites, error) {
h, err := r.Hugo(cfg) h, err := r.Hugo(cfg)
if err != nil { if err != nil {

2
commands/config.go
View file

@ -212,7 +212,7 @@ func (c *configMountsCommand) Run(ctx context.Context, cd *simplecobra.Commandee
} }
for _, m := range conf.configs.Modules { 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 return err
} }
} }

2
commands/env.go
View file

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

2
commands/hugobuilder.go
View file

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