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
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-05-29 23:33:03 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-05-29 23:33:03 +0300
commit4c560020bc0c50f8004873be8adf83698b7c095a (patch)
tree34f69d29774d2e6409436c4ecba98231947601f7
parentd44d3ea89865baa33170244cac72a7ce26419b15 (diff)
resources: Return nil when not found in resources.Get
Fixes #5999
-rw-r--r--hugolib/resource_chain_test.go5
-rw-r--r--resources/resource.go3
2 files changed, 8 insertions, 0 deletions
diff --git a/hugolib/resource_chain_test.go b/hugolib/resource_chain_test.go
index e22121b77..5a8ac22d7 100644
--- a/hugolib/resource_chain_test.go
+++ b/hugolib/resource_chain_test.go
@@ -356,6 +356,11 @@ CSV2: {{ $csv2 }}
`CSV2: [[a b c]]`,
)
}},
+ {"resources.Get", func() bool { return true }, func(b *sitesBuilder) {
+ b.WithTemplates("home.html", `NOT FOUND: {{ if (resources.Get "this-does-not-exist") }}FAILED{{ else }}OK{{ end }}`)
+ }, func(b *sitesBuilder) {
+ b.AssertFileContent("public/index.html", "NOT FOUND: OK")
+ }},
{"template", func() bool { return true }, func(b *sitesBuilder) {}, func(b *sitesBuilder) {
}},
diff --git a/resources/resource.go b/resources/resource.go
index abd251548..c120a8dd0 100644
--- a/resources/resource.go
+++ b/resources/resource.go
@@ -200,6 +200,9 @@ func (r *Spec) newResource(sourceFs afero.Fs, fd ResourceSourceDescriptor) (reso
var err error
fi, err = sourceFs.Stat(fd.SourceFilename)
if err != nil {
+ if os.IsNotExist(err) {
+ return nil, nil
+ }
return nil, err
}
sourceFilename = fd.SourceFilename