github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Fix deletion of orphaned sections

Browse source 
Avoid deleting inside the recursive walk.

Fixes #6920
This commit is contained in:
Bjørn Erik Pedersen 2020-02-20 13:40:16 +01:00
parent 24afe2b822
commit a70bbd0696
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
hugolib/content_map.go
View file

@ -596,6 +596,7 @@ func (m *contentMap) deleteBundleMatching(matches func(b *contentNode) bool) {
// Deletes any empty root section that's not backed by a content file. // Deletes any empty root section that's not backed by a content file.
func (m *contentMap) deleteOrphanSections() { func (m *contentMap) deleteOrphanSections() {
var sectionsToDelete []string
m.sections.Walk(func(s string, v interface{}) bool { m.sections.Walk(func(s string, v interface{}) bool {
n := v.(*contentNode) n := v.(*contentNode)
@ -612,11 +613,15 @@ func (m *contentMap) deleteOrphanSections() {
prefixBundle := s + cmBranchSeparator prefixBundle := s + cmBranchSeparator
if !(m.sections.hasPrefix(s+"/") || m.pages.hasPrefix(prefixBundle) || m.resources.hasPrefix(prefixBundle)) { if !(m.sections.hasPrefix(s+"/") || m.pages.hasPrefix(prefixBundle) || m.resources.hasPrefix(prefixBundle)) {
m.sections.Delete(s) sectionsToDelete = append(sectionsToDelete, s)
} }
return false return false
}) })
for _, s := range sectionsToDelete {
m.sections.Delete(s)
}
} }
func (m *contentMap) deletePage(s string) { func (m *contentMap) deletePage(s string) {