hugolib: Final fix of rssURI deprecation

Fixes #3319

diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index 56009285d3e17f16b2ba88d34f7b5b3417cd9ef9..684ff2e73d1f7dc2932d2ce90e857ca6585f4f4c 100644 (file)
--- 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))
                        }