mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-19 21:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix abs path handling in module mounts

Browse Source 
Fixes #6622
This commit is contained in:
Bjørn Erik Pedersen
2019-12-19 12:17:44 +01:00
parent 158e7ec204
commit ad6504e6b5
4 changed files with 71 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/collect.go
View File

@@ -548,7 +548,7 @@ func (c *collector) loadModules() error {
return nil
}
func (c *collector) normalizeMounts(owner Module, mounts []Mount) ([]Mount, error) {
func (c *collector) normalizeMounts(owner *moduleAdapter, mounts []Mount) ([]Mount, error) {
var out []Mount
dir := owner.Dir()
@@ -562,8 +562,16 @@ func (c *collector) normalizeMounts(owner Module, mounts []Mount) ([]Mount, erro
mnt.Source = filepath.Clean(mnt.Source)
mnt.Target = filepath.Clean(mnt.Target)
var sourceDir string
if owner.projectMod && filepath.IsAbs(mnt.Source) {
// Abs paths in the main project is allowed.
sourceDir = mnt.Source
} else {
sourceDir = filepath.Join(dir, mnt.Source)
}
// Verify that Source exists
sourceDir := filepath.Join(dir, mnt.Source)
_, err := c.fs.Stat(sourceDir)
if err != nil {
continue