diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index 6be26d60e99..61478a2d3ff 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -1094,9 +1094,6 @@ func (m *contentChangeMap) resolveAndRemove(filename string) (string, bundleDirT // Bundles share resources, so we need to start from the virtual root. relFilename := m.pathSpec.RelContentDir(filename) dir, name := filepath.Split(relFilename) - if !strings.HasSuffix(dir, helpers.FilePathSeparator) { - dir += helpers.FilePathSeparator - } if _, found := m.branchBundles[dir]; found { delete(m.branchBundles, dir) diff --git a/hugolib/pages_capture.go b/hugolib/pages_capture.go index da7515fc22b..165b3561985 100644 --- a/hugolib/pages_capture.go +++ b/hugolib/pages_capture.go @@ -157,7 +157,6 @@ func (c *pagesCollector) isCascadingEdit(dir contentDirKey) (bool, string) { return isCascade, section } -// Collect. func (c *pagesCollector) Collect() (collectErr error) { c.proc.Start(context.Background()) defer func() { diff --git a/hugolib/pages_process.go b/hugolib/pages_process.go index 196a566f095..ce19f1370b5 100644 --- a/hugolib/pages_process.go +++ b/hugolib/pages_process.go @@ -19,7 +19,6 @@ import ( "path/filepath" "github.com/gohugoio/hugo/config" - "github.com/gohugoio/hugo/source" "github.com/gohugoio/hugo/hugofs/files" "golang.org/x/sync/errgroup" @@ -28,7 +27,7 @@ import ( "github.com/gohugoio/hugo/hugofs" ) -func newPagesProcessor(h *HugoSites, sp *source.SourceSpec) *pagesProcessor { +func newPagesProcessor(h *HugoSites) *pagesProcessor { procs := make(map[string]pagesCollectorProcessorProvider) for _, s := range h.Sites { procs[s.Lang()] = &sitePagesProcessor{ diff --git a/hugolib/site.go b/hugolib/site.go index cbfc4d836e0..827c32cfba3 100644 --- a/hugolib/site.go +++ b/hugolib/site.go @@ -1411,7 +1411,7 @@ func (s *Site) eventToIdentity(e fsnotify.Event) (identity.PathIdentity, bool) { func (s *Site) readAndProcessContent(buildConfig BuildCfg, filenames ...string) error { sourceSpec := source.NewSourceSpec(s.PathSpec, buildConfig.ContentInclusionFilter, s.BaseFs.Content.Fs) - proc := newPagesProcessor(s.h, sourceSpec) + proc := newPagesProcessor(s.h) c := newPagesCollector(sourceSpec, s.h.getContentMaps(), s.Log, s.h.ContentChanges, proc, filenames...)