From: Anthony Fok <foka@debian.org>
Date: Thu, 3 Dec 2015 19:02:38 +0000 (-0700)
Subject: Fix crash with "config", "check" and "benchmark"
X-Git-Tag: v0.16~543
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cd062623;p=brevno-suite%2Fhugo

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
---

diff --git a/commands/hugo.go b/commands/hugo.go
index f250d4ef..3d26d826 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 adcf6dff..1ca39278 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
 	}