From 0395cf2bc0858e9d7e1230e122bf6b661b5f6f48 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Mon, 20 Jan 2025 00:59:05 -0800 Subject: [PATCH] fix(model): clarify errors on Windows user/group lookup (fixes #9929) (#9930) Currently, this just results in a very ambiguous `setting metadata: lookup failed` while it could report what it's looking up and why it failed (not found, etc). --- lib/model/folder_sendrecv_windows.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/model/folder_sendrecv_windows.go b/lib/model/folder_sendrecv_windows.go index 28ebe01d1..6028ca522 100644 --- a/lib/model/folder_sendrecv_windows.go +++ b/lib/model/folder_sendrecv_windows.go @@ -7,7 +7,7 @@ package model import ( - "errors" + "fmt" "os/user" "strings" @@ -44,7 +44,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) { return "", err }) if err != nil { - return "", "", err + return "", "", fmt.Errorf("lookup group %v: %w", name, err) } return "", gr, nil } @@ -57,7 +57,7 @@ func lookupUserAndGroup(name string, group bool) (string, string, error) { return "", err }) if err != nil { - return "", "", err + return "", "", fmt.Errorf("lookup user %v: %w", name, err) } return us, "", nil } @@ -74,9 +74,9 @@ func lookupWithoutDomain(name string, lookup func(s string) (string, error)) (st } parts := strings.Split(name, `\`) if len(parts) == 2 { - if v, err := lookup(parts[1]); err == nil { + if v, err = lookup(parts[1]); err == nil { return v, nil } } - return "", errors.New("lookup failed") + return "", err }