Handle errors gracefully in keyring

twpayne · Nov 30, 2018 · e612476 · e612476
1 parent 377d68e
commit e612476
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cmd/keyring.go b/cmd/keyring.go
@@ -1,7 +1,10 @@
 package cmd
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
+	"github.com/twpayne/chezmoi/lib/chezmoi"
 	"github.com/zalando/go-keyring"
 )
 
@@ -35,7 +38,7 @@ func init() {
 func (*Config) keyringFunc(service, user string) string {
 	password, err := keyring.Get(service, user)
 	if err != nil {
-		return err.Error()
+		chezmoi.ReturnTemplateFuncError(fmt.Errorf("keyring %q %q: %v", service, user, err))
 	}
 	return password
 }