hugolib: Deprecate rssURI

diff --git a/hugolib/site_output.go b/hugolib/site_output.go
index acd5d1cd1c9e7f51bb9c5825ecd02be8a9ac9536..f321848e31ac06efeffb30511f2f774cfdc005b9 100644 (file)
--- a/hugolib/site_output.go
+++ b/hugolib/site_output.go
@@ -20,6 +20,7 @@ import (
 
        "github.com/spf13/cast"
        "github.com/spf13/hugo/config"
+       "github.com/spf13/hugo/helpers"
        "github.com/spf13/hugo/output"
 )
 
@@ -72,15 +73,18 @@ func createDefaultOutputFormats(cfg config.Provider) (map[string]output.Formats,
 
                // All but page have RSS
                if kind != KindPage {
-                       // TODO(bep) output deprecate rssURI
+                       rssType := output.RSSFormat
+
                        rssBase := cfg.GetString("rssURI")
                        if rssBase == "" {
-                               rssBase = "index"
+                               rssBase = rssType.BaseName
+                       } else {
+                               // Remove in Hugo 0.22.
+                               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))
                        }
 
-                       // RSS has now a well defined media type, so strip any suffix provided
-                       rssBase = strings.TrimSuffix(rssBase, path.Ext(rssBase))
-                       rssType := output.RSSFormat
                        rssType.BaseName = rssBase
                        formats = append(formats, rssType)
 

diff --git a/hugolib/site_render.go b/hugolib/site_render.go
index 6f0cf3b996da0275a620af951958154254fe5558..0c9da2134373129bbf47291491555778ca886c68 100644 (file)
--- a/hugolib/site_render.go
+++ b/hugolib/site_render.go
@@ -145,7 +145,7 @@ func (s *Site) renderPaginator(p *PageOutput) error {
                        return err
                }
 
-               // TODO(bep) output do better
+               // TODO(bep) do better
                link := newOutputFormat(p.Page, p.outputFormat).Permalink()
                if err := s.writeDestAlias(target, link, nil); err != nil {
                        return err
@@ -222,7 +222,6 @@ func (s *Site) renderRSS(p *PageOutput) error {
                return err
        }
 
-       // TODO(bep) output deprecate/handle rssURI
        targetPath, err := p.targetPath()
        if err != nil {
                return err