From 901077c0364eaf3fe4f997c3026aa18cfc7781ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 6 Sep 2019 11:03:23 +0200 Subject: [PATCH] hugolib: Fix broken bundle live reload logic Fixes #6315 Updates #6308 --- hugolib/hugo_sites.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/hugolib/hugo_sites.go b/hugolib/hugo_sites.go index 987144f1d..c0d75c09f 100644 --- a/hugolib/hugo_sites.go +++ b/hugolib/hugo_sites.go @@ -837,15 +837,16 @@ type contentChangeMap struct { symContent map[string]map[string]bool } -func (m *contentChangeMap) add(filename string, tp bundleDirType) { +func (m *contentChangeMap) add(dirname string, tp bundleDirType) { m.mu.Lock() - dir := filepath.Dir(filename) + helpers.FilePathSeparator - dir = strings.TrimPrefix(dir, ".") + if !strings.HasSuffix(dirname, helpers.FilePathSeparator) { + dirname += helpers.FilePathSeparator + } switch tp { case bundleBranch: - m.branchBundles[dir] = true + m.branchBundles[dirname] = true case bundleLeaf: - m.leafBundles.Insert(dir, true) + m.leafBundles.Insert(dirname, true) default: panic("invalid bundle type") }