From cd062623bd9eb1ded58b774086236ccc8130db8b Mon Sep 17 00:00:00 2001 From: Anthony Fok Date: Thu, 3 Dec 2015 12:02:38 -0700 Subject: [PATCH] Fix crash with "config", "check" and "benchmark" The crash was introduced by commit 00d04774 in PR #1652 where access to NoTimes was attempted even though --noTimes was not defined for the config, check and benchmark commands. Special thanks to @bep for the heads-up! See also #1624 - CLI UX: Flags shouldn't be global --- commands/hugo.go | 7 ++++--- commands/server.go | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/commands/hugo.go b/commands/hugo.go index f250d4eff..3d26d8265 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -310,9 +310,10 @@ func InitializeConfig(subCmdVs ...*cobra.Command) error { if cmdV.Flags().Lookup("ignoreCache").Changed { viper.Set("IgnoreCache", IgnoreCache) } - if cmdV.Flags().Lookup("noTimes").Changed { - viper.Set("NoTimes", NoTimes) - } + } + + if hugoCmdV.Flags().Lookup("noTimes").Changed { + viper.Set("NoTimes", NoTimes) } if BaseURL != "" { diff --git a/commands/server.go b/commands/server.go index adcf6dff2..1ca39278b 100644 --- a/commands/server.go +++ b/commands/server.go @@ -148,6 +148,10 @@ func server(cmd *cobra.Command, args []string) error { viper.Set("PublishDir", "/") } + if serverCmd.Flags().Lookup("noTimes").Changed { + viper.Set("NoTimes", NoTimes) + } + if err := build(serverWatch); err != nil { return err }