From: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Mon, 2 Mar 2020 11:39:26 +0000 (+0100)
Subject: resources: Add full filename to image when processing fails
X-Git-Tag: v0.66.0~12
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=305ce1c9ec746d3b8f6c9306b7014bfd621478a5;p=brevno-suite%2Fhugo

resources: Add full filename to image when processing fails

Fixes #7000
---

diff --git a/resources/image.go b/resources/image.go
index 076f2ae4..d1d9f650 100644
--- a/resources/image.go
+++ b/resources/image.go
@@ -36,6 +36,7 @@ import (
 
 	"github.com/gohugoio/hugo/resources/resource"
 
+	"github.com/pkg/errors"
 	_errors "github.com/pkg/errors"
 
 	"github.com/gohugoio/hugo/helpers"
@@ -234,7 +235,7 @@ const imageProcWorkers = 1
 var imageProcSem = make(chan bool, imageProcWorkers)
 
 func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src image.Image) (image.Image, error)) (resource.Image, error) {
-	return i.getSpec().imageCache.getOrCreate(i, conf, func() (*imageResource, image.Image, error) {
+	img, err := i.getSpec().imageCache.getOrCreate(i, conf, func() (*imageResource, image.Image, error) {
 		imageProcSem <- true
 		defer func() {
 			<-imageProcSem
@@ -291,6 +292,13 @@ func (i *imageResource) doWithImageConfig(conf images.ImageConfig, f func(src im
 
 		return ci, converted, nil
 	})
+
+	if err != nil {
+		if i.root != nil && i.root.getFileInfo() != nil {
+			return nil, errors.Wrapf(err, "image %q", i.root.getFileInfo().Meta().Filename())
+		}
+	}
+	return img, nil
 }
 
 func (i *imageResource) decodeImageConfig(action, spec string) (images.ImageConfig, error) {