Fix duplicate mount sources

Fixes #9426

diff --git a/hugofs/walk.go b/hugofs/walk.go
index 44d58f060858e6f9ef4ee32e07cf45007a259ca4..c02d366713fd69a10e93e949483410cbbabf1816 100644 (file)
--- a/hugofs/walk.go
+++ b/hugofs/walk.go
@@ -270,7 +270,7 @@ func (w *Walkway) walk(path string, info FileMetaInfo, dirEntries []FileMetaInfo
                meta.Path = normalizeFilename(pathMeta)
                meta.PathWalk = pathn
 
-               if fim.IsDir() && w.isSeen(meta.Filename) {
+               if fim.IsDir() && meta.IsSymlink && w.isSeen(meta.Filename) {
                        // Prevent infinite recursion
                        // Possible cyclic reference
                        meta.SkipDir = true

diff --git a/hugofs/walk_test.go b/hugofs/walk_test.go
index 4825ba36e6d6a229fb5308e7bf50c33bc793b664..2d9ec784d571ca943a15eb07b23c661e5d01d052 100644 (file)
--- a/hugofs/walk_test.go
+++ b/hugofs/walk_test.go
@@ -81,14 +81,12 @@ func TestWalkRootMappingFs(t *testing.T) {
        }
 
        c.Run("Basic", func(c *qt.C) {
-
                bfs := prepare(c)
 
                names, err := collectFilenames(bfs, "", "")
 
                c.Assert(err, qt.IsNil)
                c.Assert(names, qt.DeepEquals, []string{"a/test.txt", "b/test.txt", "c/test.txt"})
-
        })
 
        c.Run("Para", func(c *qt.C) {
@@ -112,12 +110,10 @@ func TestWalkRootMappingFs(t *testing.T) {
                                        return errors.New("fail")
                                }
                                return nil
-
                        })
                }
 
                c.Assert(r.Wait(), qt.IsNil)
-
        })
 }
 
@@ -169,7 +165,7 @@ func TestWalkSymbolicLink(t *testing.T) {
                names, err := collectFilenames(fs, workDir, workDir)
                c.Assert(err, qt.IsNil)
 
-               c.Assert(names, qt.DeepEquals, []string{"blog/real/sub/a.txt", "docs/b.txt"})
+               c.Assert(names, qt.DeepEquals, []string{"blog/real/sub/a.txt", "blog/symlinked/sub/a.txt", "docs/b.txt"})
        })
 
        t.Run("BasePath Fs", func(t *testing.T) {

diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go
index a119d4c179024a5a02cd588fc8086bc0c731b295..7fbb539542214dddecd823966c44b0133894f224 100644 (file)
--- a/hugolib/filesystems/basefs_test.go
+++ b/hugolib/filesystems/basefs_test.go
@@ -33,7 +33,6 @@ import (
        "github.com/gohugoio/hugo/hugofs"
        "github.com/gohugoio/hugo/hugolib/paths"
        "github.com/gohugoio/hugo/modules"
-       
 )
 
 func initConfig(fs afero.Fs, cfg config.Provider) error {
@@ -152,7 +151,7 @@ theme = ["atheme"]
        checkFileCount(bfs.Data.Fs, "", c, 11)       // 7 + 4 themes
        checkFileCount(bfs.Archetypes.Fs, "", c, 10) // 8 + 2 themes
        checkFileCount(bfs.Assets.Fs, "", c, 9)
-       checkFileCount(bfs.Work, "", c, 82)
+       checkFileCount(bfs.Work, "", c, 90)
 
        c.Assert(bfs.IsData(filepath.Join(workingDir, "mydata", "file1.txt")), qt.Equals, true)
        c.Assert(bfs.IsI18n(filepath.Join(workingDir, "myi18n", "file1.txt")), qt.Equals, true)

diff --git a/hugolib/hugo_modules_test.go b/hugolib/hugo_modules_test.go
index 464230437502be0cd0478be36676bfa1fb7fa08a..eb6b7433b5eab3708655829d88a1e9b8e8ced32e 100644 (file)
--- a/hugolib/hugo_modules_test.go
+++ b/hugolib/hugo_modules_test.go
@@ -1134,3 +1134,39 @@ P1: {{ $p1.Title }}|{{ $p1.RelPermalink }}|Filename: {{ $p1.File.Filename }}
 
        b.AssertFileContent("public/index.html", "P1: Abs|/p1/", "Filename: "+contentFilename)
 }
+
+// Issue 9426
+func TestMountSameSource(t *testing.T) {
+       config := `baseURL = 'https://example.org/'
+languageCode = 'en-us'
+title = 'Hugo GitHub Issue #9426'
+
+disableKinds = ['RSS','sitemap','taxonomy','term']
+
+[[module.mounts]]
+source = "content"
+target = "content"
+
+[[module.mounts]]
+source = "extra-content"
+target = "content/resources-a"
+
+[[module.mounts]]
+source = "extra-content"
+target = "content/resources-b"
+`
+       b := newTestSitesBuilder(t).WithConfigFile("toml", config)
+
+       b.WithContent("p1.md", "")
+
+       b.WithSourceFile(
+               "extra-content/_index.md", "",
+               "extra-content/subdir/_index.md", "",
+               "extra-content/subdir/about.md", "",
+       )
+
+       b.Build(BuildCfg{})
+
+       b.AssertFileContent("public/resources-a/subdir/about/index.html", "Single")
+       b.AssertFileContent("public/resources-b/subdir/about/index.html", "Single")
+}