Make readFile return nil when file not found (note)

Fixes #9620
This commit is contained in:
Bjørn Erik Pedersen 2022-12-30 11:10:49 +01:00
parent dd6d0a6de1
commit 3c51625c71
2 changed files with 32 additions and 1 deletions

View file

@ -49,3 +49,29 @@ START:|{{ range $entry := $entries }}{{ if not $entry.IsDir }}{{ $entry.Name }}|
START:|config.toml|myproject.txt|:END: START:|config.toml|myproject.txt|:END:
`) `)
} }
// Issue 9620
func TestReadFileNotExists(t *testing.T) {
t.Parallel()
files := `
-- config.toml --
-- layouts/index.html --
{{ $fi := (readFile "doesnotexist") }}
{{ if $fi }}Failed{{ else }}OK{{ end }}
`
b := hugolib.NewIntegrationTestBuilder(
hugolib.IntegrationTestConfig{
T: t,
TxtarString: files,
NeedsOsFS: true,
},
).Build()
b.AssertFileContent("public/index.html", `
OK
`)
}

View file

@ -22,6 +22,7 @@ import (
"path/filepath" "path/filepath"
"github.com/bep/overlayfs" "github.com/bep/overlayfs"
"github.com/gohugoio/hugo/common/herrors"
"github.com/gohugoio/hugo/deps" "github.com/gohugoio/hugo/deps"
"github.com/spf13/afero" "github.com/spf13/afero"
"github.com/spf13/cast" "github.com/spf13/cast"
@ -101,7 +102,11 @@ func (ns *Namespace) ReadFile(i any) (string, error) {
s = ns.deps.PathSpec.RelPathify(s) s = ns.deps.PathSpec.RelPathify(s)
} }
return readFile(ns.readFileFs, s) s, err = readFile(ns.readFileFs, s)
if err != nil && herrors.IsNotExist(err) {
return "", nil
}
return s, err
} }
// ReadDir lists the directory contents relative to the configured WorkingDir. // ReadDir lists the directory contents relative to the configured WorkingDir.