Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-11-16 21:54:41 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2021-11-16 22:42:34 +0300
commit2e70f61fb04cea08ef6598728a57637ae2cc199c (patch)
tree8e975b19634eacf3dbfb5197e5ff1b2be7fb3040 /hugolib
parent1ed8069a3a592dbbd493778a9637fb13727f4c61 (diff)
Fix content dir resolution when main project is a Hugo Module
Fixes #9177
Diffstat (limited to 'hugolib')
-rw-r--r--hugolib/filesystems/basefs.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go
index be765ef9d..a51cc4b27 100644
--- a/hugolib/filesystems/basefs.go
+++ b/hugolib/filesystems/basefs.go
@@ -136,7 +136,7 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string, error) {
isAbs := filepath.IsAbs(filename)
for _, dir := range b.SourceFilesystems.Content.Dirs {
meta := dir.Meta()
- if meta.Module != "project" {
+ if !meta.IsProject {
continue
}
if isAbs {
@@ -161,7 +161,7 @@ func (b *BaseFs) AbsProjectContentDir(filename string) (string, string, error) {
contentDirs := b.SourceFilesystems.Content.Dirs
for i := len(contentDirs) - 1; i >= 0; i-- {
meta := contentDirs[i].Meta()
- if meta.Module == "project" {
+ if meta.IsProject {
return filename, filepath.Join(meta.Filename, filename), nil
}
}
@@ -645,6 +645,7 @@ func (b *sourceFilesystemsBuilder) createModFs(
To: filename,
ToBasedir: base,
Module: md.Module.Path(),
+ IsProject: md.isMainProject,
Meta: &hugofs.FileMeta{
Watch: md.Watch(),
Weight: mountWeight,