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
path: root/hugofs
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-02-09 16:17:47 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2020-02-09 23:35:39 +0300
commit18888e09bbb5325bdd63f2cd93116ff490dd37ab (patch)
treec6f5501f79a4fdae5d92056d3abb562e57df13d0 /hugofs
parent1e5eb8679ece0ce8dab3aca6c3267d6a206b790d (diff)
Fix bundle resource ordering regression
Introduced in Hugo 0.64.0 Fixes #6851
Diffstat (limited to 'hugofs')
-rw-r--r--hugofs/fileinfo.go4
-rw-r--r--hugofs/rootmapping_fs.go10
2 files changed, 7 insertions, 7 deletions
diff --git a/hugofs/fileinfo.go b/hugofs/fileinfo.go
index 0f20ec386..255295b75 100644
--- a/hugofs/fileinfo.go
+++ b/hugofs/fileinfo.go
@@ -272,7 +272,7 @@ func (fi *dirNameOnlyFileInfo) Sys() interface{} {
return nil
}
-func newDirNameOnlyFileInfo(name string, meta FileMeta, isOrdered bool, fileOpener func() (afero.File, error)) FileMetaInfo {
+func newDirNameOnlyFileInfo(name string, meta FileMeta, fileOpener func() (afero.File, error)) FileMetaInfo {
name = normalizeFilename(name)
_, base := filepath.Split(name)
@@ -281,7 +281,7 @@ func newDirNameOnlyFileInfo(name string, meta FileMeta, isOrdered bool, fileOpen
m.setIfNotZero(metaKeyFilename, name)
}
m[metaKeyOpener] = fileOpener
- m[metaKeyIsOrdered] = isOrdered
+ m[metaKeyIsOrdered] = false
return NewFileMetaInfo(
&dirNameOnlyFileInfo{name: base},
diff --git a/hugofs/rootmapping_fs.go b/hugofs/rootmapping_fs.go
index ea8b7e04d..26d6ffa3c 100644
--- a/hugofs/rootmapping_fs.go
+++ b/hugofs/rootmapping_fs.go
@@ -367,7 +367,7 @@ func (fs *RootMappingFs) collectDirEntries(prefix string) ([]os.FileInfo, error)
opener := func() (afero.File, error) {
return fs.Open(filepath.Join(rm.From, name))
}
- fi = newDirNameOnlyFileInfo(name, meta, false, opener)
+ fi = newDirNameOnlyFileInfo(name, meta, opener)
}
fis = append(fis, fi)
@@ -396,7 +396,7 @@ func (fs *RootMappingFs) collectDirEntries(prefix string) ([]os.FileInfo, error)
return fs.Open(path)
}
- fi := newDirNameOnlyFileInfo(name, nil, false, opener)
+ fi := newDirNameOnlyFileInfo(name, nil, opener)
fis = append(fis, fi)
return false
@@ -419,7 +419,7 @@ func (fs *RootMappingFs) collectDirEntries(prefix string) ([]os.FileInfo, error)
return fs.Open(rm.From)
}
- fi := newDirNameOnlyFileInfo(name, rm.Meta, false, opener)
+ fi := newDirNameOnlyFileInfo(name, rm.Meta, opener)
fis = append(fis, fi)
@@ -441,7 +441,7 @@ func (fs *RootMappingFs) doLstat(name string) ([]FileMetaInfo, error) {
if fs.hasPrefix(key) {
// We have directories mounted below this.
// Make it look like a directory.
- return []FileMetaInfo{newDirNameOnlyFileInfo(name, nil, true, fs.virtualDirOpener(name))}, nil
+ return []FileMetaInfo{newDirNameOnlyFileInfo(name, nil, fs.virtualDirOpener(name))}, nil
}
// Find any real files or directories with this key.
@@ -484,7 +484,7 @@ func (fs *RootMappingFs) doLstat(name string) ([]FileMetaInfo, error) {
if fileCount == 0 {
// Dir only.
- return []FileMetaInfo{newDirNameOnlyFileInfo(name, roots[0].Meta, true, fs.virtualDirOpener(name))}, nil
+ return []FileMetaInfo{newDirNameOnlyFileInfo(name, roots[0].Meta, fs.virtualDirOpener(name))}, nil
}
if fileCount > 1 {