Skip to content

Commit

Permalink
Make sure any default mounts show up in "hugo config"
Browse files Browse the repository at this point in the history
Fixes #11040
  • Loading branch information
bep committed Jun 1, 2023
1 parent 06faee5 commit e3ae8f0
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
15 changes: 15 additions & 0 deletions config/allconfig/allconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,21 @@ func (c *Configs) Init() error {
return err
}

// We should consolidate this, but to get a full view of the mounts in e.g. "hugo config" we need to
// transfer any default mounts added above to the config used to print the config.
for _, m := range c.Modules[0].Mounts() {
var found bool
for _, cm := range c.Base.Module.Mounts {
if cm.Source == m.Source && cm.Target == m.Target && cm.Lang == m.Lang {
found = true
break
}
}
if !found {
c.Base.Module.Mounts = append(c.Base.Module.Mounts, m)
}
}

return nil
}

Expand Down
26 changes: 26 additions & 0 deletions hugolib/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1151,3 +1151,29 @@ weight = 1
})

}

// Issue #11040
func TestConfigModuleDefaultMountsInConfig(t *testing.T) {
t.Parallel()

files := `
-- hugo.toml --
baseURL = "https://example.org"
contentDir = "mycontent"
-- layouts/index.html --
Home.
`
b := NewIntegrationTestBuilder(
IntegrationTestConfig{
T: t,
TxtarString: files,
},
).Build()

modConf := b.H.Configs.Base.Module

b.Assert(modConf.Mounts, qt.HasLen, 7)

}

0 comments on commit e3ae8f0

Please sign in to comment.