From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Wed, 10 May 2017 18:00:08 +0000 (+0200)
Subject: commands, hugolib: Deprecate disable404, disableRSS, disableSitemap, disableRobotsTXT
X-Git-Tag: v0.21~38
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5794a265;p=brevno-suite%2Fhugo

commands, hugolib: Deprecate disable404, disableRSS, disableSitemap, disableRobotsTXT

Use disableKinds instead.

Fixes #3345
---

diff --git a/commands/hugo.go b/commands/hugo.go
index 4c12ccc7..b7bc863a 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -467,6 +467,19 @@ func (c *commandeer) initializeFlags(cmd *cobra.Command) {
 		"noChmod",
 	}
 
+	// Remove these in Hugo 0.23.
+	if flagChanged(cmd.Flags(), "disable404") {
+		helpers.Deprecated("command line", "--disable404", "Use --disableKinds=404", false)
+	}
+
+	if flagChanged(cmd.Flags(), "disableRSS") {
+		helpers.Deprecated("command line", "--disableRSS", "Use --disableKinds=RSS", false)
+	}
+
+	if flagChanged(cmd.Flags(), "disableSitemap") {
+		helpers.Deprecated("command line", "--disableSitemap", "Use --disableKinds=sitemap", false)
+	}
+
 	for _, key := range persFlagKeys {
 		c.setValueFromFlag(cmd.PersistentFlags(), key)
 	}
diff --git a/hugolib/config.go b/hugolib/config.go
index 50e742bc..8847b349 100644
--- a/hugolib/config.go
+++ b/hugolib/config.go
@@ -49,6 +49,23 @@ func LoadConfig(fs afero.Fs, relativeSourcePath, configFilename string) (*viper.
 
 	v.RegisterAlias("indexes", "taxonomies")
 
+	// Remove these in Hugo 0.23.
+	if v.IsSet("disable404") {
+		helpers.Deprecated("site config", "disable404", "Use disableKinds=[\"404\"]", false)
+	}
+
+	if v.IsSet("disableRSS") {
+		helpers.Deprecated("site config", "disableRSS", "Use disableKinds=[\"RSS\"]", false)
+	}
+
+	if v.IsSet("disableSitemap") {
+		helpers.Deprecated("site config", "disableSitemap", "Use disableKinds= [\"sitemap\"]", false)
+	}
+
+	if v.IsSet("disableRobotsTXT") {
+		helpers.Deprecated("site config", "disableRobotsTXT", "Use disableKinds= [\"robotsTXT\"]", false)
+	}
+
 	loadDefaultSettingsFor(v)
 
 	return v, nil