From de0dc58b99ec66b0b103186b4ecf90cc2481b508 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch
Date: Sat, 20 Jan 2024 18:33:17 +0100 Subject: gallery: don't be silent about signalled children --- main.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 972e1b3..384cf85 100644 --- a/main.go +++ b/main.go @@ -1415,7 +1415,11 @@ func syncPostProcess(c *syncContext, info syncFileInfo) error { case info.err != nil: // * → error if ee, ok := info.err.(*exec.ExitError); ok { - syncPrintf(c, "%s: %s", info.fsPath, ee.Stderr) + message := string(ee.Stderr) + if message == "" { + message = ee.String() + } + syncPrintf(c, "%s: %s", info.fsPath, message) } else { return info.err } @@ -2237,7 +2241,10 @@ func cmdThumbnail(fs *flag.FlagSet, args []string) error { w, h, err := makeThumbnail(*load, pathImage, pathThumb) if err != nil { if ee, ok := err.(*exec.ExitError); ok { - return string(ee.Stderr), nil + if message = string(ee.Stderr); message != "" { + return message, nil + } + return ee.String(), nil } return "", err } -- cgit v1.2.3-70-g09d2