From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 10 Apr 2017 19:26:55 +0000 (+0200)
Subject: hugolib: Final fix of rssURI deprecation
X-Git-Tag: v0.20.1~9
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9ec00725;p=brevno-suite%2Fhugo

hugolib: Final fix of rssURI deprecation

Fixes #3319
---

diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index 56009285..684ff2e7 100644
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -76,13 +76,11 @@ func createDefaultOutputFormats(cfg config.Provider) (map[string]output.Formats,
 			rssType := output.RSSFormat
 
 			rssBase := cfg.GetString("rssURI")
-			if rssBase == "" {
+			if rssBase == "" || rssBase == "index.xml" {
 				rssBase = rssType.BaseName
 			} else {
 				// Remove in Hugo 0.22.
-				if rssBase != "index.xml" {
-					helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", false)
-				}
+				helpers.Deprecated("Site config", "rssURI", "Set baseName in outputFormats.RSS", false)
 				// RSS has now a well defined media type, so strip any suffix provided
 				rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase))
 			}