fix for commit 6f5dc73: set Meta whenever header.tmpl is involved

Debian · Jan 21, 2017 · f8ca751 · f8ca751
1 parent 17e636c
commit f8ca751
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/cmd/debiman/renderaux.go b/cmd/debiman/renderaux.go
@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/Debian/debiman/internal/bundled"
+	"github.com/Debian/debiman/internal/manpage"
 )
 
 var indexTmpl = mustParseIndexTmpl()
@@ -56,6 +57,7 @@ func renderAux(destDir string, gv globalView) error {
 			Breadcrumbs    []breadcrumb
 			FooterExtra    string
 			Suites         []string
+			Meta           *manpage.Meta
 		}{
 			Title:          "index",
 			Suites:         suites,
@@ -71,6 +73,7 @@ func renderAux(destDir string, gv globalView) error {
 			DebimanVersion string
 			Breadcrumbs    []breadcrumb
 			FooterExtra    string
+			Meta           *manpage.Meta
 		}{
 			Title:          "FAQ",
 			DebimanVersion: debimanVersion,
@@ -85,6 +88,7 @@ func renderAux(destDir string, gv globalView) error {
 			DebimanVersion string
 			Breadcrumbs    []breadcrumb
 			FooterExtra    string
+			Meta           *manpage.Meta
 		}{
 			Title:          "FAQ",
 			DebimanVersion: debimanVersion,

diff --git a/cmd/debiman/rendercontents.go b/cmd/debiman/rendercontents.go
@@ -9,6 +9,7 @@ import (
 	"sort"
 
 	"github.com/Debian/debiman/internal/bundled"
+	"github.com/Debian/debiman/internal/manpage"
 )
 
 var contentsTmpl = mustParseContentsTmpl()
@@ -28,6 +29,7 @@ func renderContents(dest, suite string, bins []string) error {
 			FooterExtra    string
 			Bins           []string
 			Suite          string
+			Meta           *manpage.Meta
 		}{
 			Title:          fmt.Sprintf("Contents of Debian %s", suite),
 			DebimanVersion: debimanVersion,

diff --git a/cmd/debiman/renderpkgindex.go b/cmd/debiman/renderpkgindex.go
@@ -36,6 +36,7 @@ func renderPkgindex(dest string, manpageByName map[string]*manpage.Meta) error {
 			Breadcrumbs    []breadcrumb
 			FooterExtra    string
 			First          *manpage.Meta
+			Meta           *manpage.Meta
 			ManpageByName  map[string]*manpage.Meta
 			Mans           []string
 		}{
@@ -47,6 +48,7 @@ func renderPkgindex(dest string, manpageByName map[string]*manpage.Meta) error {
 				{"", "Contents"},
 			},
 			First:         first,
+			Meta:          first,
 			ManpageByName: manpageByName,
 			Mans:          mans,
 		})

diff --git a/internal/aux/aux.go b/internal/aux/aux.go
@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/Debian/debiman/internal/manpage"
 	"github.com/Debian/debiman/internal/redirect"
 )
 
@@ -66,6 +67,7 @@ func (s *Server) HandleRedirect(w http.ResponseWriter, r *http.Request) {
 				FooterExtra    string
 				Manpage        string
 				BestChoice     redirect.IndexEntry
+				Meta           *manpage.Meta
 			}{
 				Title:          "Not Found",
 				DebimanVersion: s.debimanVersion,